diff --git a/pom.xml b/pom.xml
index e3c745ba7..fbf0b0e47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>WaarpR66</artifactId>
   <name>Waarp OpenR66</name>
-  <version>3.1.0</version>
+  <version>3.1.1</version>
   <description>
   OpenR66 is a File Transfer Monitor to be used in real production to transfer files between servers.
   It allows to start/restart a transfer, check the remote MD5, check status, make pre or post
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>Waarp</groupId>
       <artifactId>WaarpCommon</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.1</version>
       <exclusions>
       	<exclusion>
       		<artifactId>xml-apis</artifactId>
@@ -115,13 +115,13 @@
     <dependency>
     	<groupId>Waarp</groupId>
     	<artifactId>WaarpExec</artifactId>
-    	<version>3.0.5</version>
+    	<version>3.1.0</version>
     	<optional>true</optional>
     </dependency>
     <dependency>
     	<groupId>Waarp</groupId>
     	<artifactId>WaarpSnmp</artifactId>
-    	<version>3.0.7</version>
+    	<version>3.1.0</version>
     	<optional>true</optional>
     </dependency>
     <dependency>
@@ -137,7 +137,7 @@
     <dependency>
     	<groupId>Waarp</groupId>
     	<artifactId>WaarpThrift</artifactId>
-    	<version>3.0.7</version>
+    	<version>3.1.0</version>
     	<optional>true</optional>
     </dependency>
     <dependency>
@@ -167,12 +167,12 @@
     <dependency>
         <groupId>Waarp</groupId>
         <artifactId>WaarpGatewayKernel</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </dependency>
     <dependency>
         <groupId>Waarp</groupId>
         <artifactId>WaarpFtpClient</artifactId>
-        <version>3.0.7</version>
+        <version>3.1.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/src/main/java/org/waarp/openr66/client/AbstractTransfer.java b/src/main/java/org/waarp/openr66/client/AbstractTransfer.java
index ae449d2a9..4609e01ee 100644
--- a/src/main/java/org/waarp/openr66/client/AbstractTransfer.java
+++ b/src/main/java/org/waarp/openr66/client/AbstractTransfer.java
@@ -21,7 +21,9 @@
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import org.waarp.common.command.exception.CommandAbstractException;
 import org.waarp.common.database.data.AbstractDbData.UpdatedInfo;
@@ -34,6 +36,7 @@
 import org.waarp.openr66.context.ErrorCode;
 import org.waarp.openr66.context.R66Result;
 import org.waarp.openr66.context.R66Session;
+import org.waarp.openr66.context.filesystem.R66Dir;
 import org.waarp.openr66.context.filesystem.R66File;
 import org.waarp.openr66.context.task.exception.OpenR66RunnerErrorException;
 import org.waarp.openr66.database.DbConstant;
@@ -43,7 +46,10 @@
 import org.waarp.openr66.protocol.configuration.Messages;
 import org.waarp.openr66.protocol.configuration.PartnerConfiguration;
 import org.waarp.openr66.protocol.exception.OpenR66DatabaseGlobalException;
+import org.waarp.openr66.protocol.localhandler.packet.InformationPacket;
 import org.waarp.openr66.protocol.localhandler.packet.RequestPacket;
+import org.waarp.openr66.protocol.localhandler.packet.ValidPacket;
+import org.waarp.openr66.protocol.networkhandler.NetworkTransaction;
 import org.waarp.openr66.protocol.utils.FileUtils;
 import org.waarp.openr66.protocol.utils.R66Future;
 
@@ -340,4 +346,72 @@ protected void finalizeInErrorTransferRequest(ClientRunner runner, DbTaskRunner
             runner.changeUpdatedInfo(UpdatedInfo.INERROR, code, true);
         }
     }
+
+
+    public List<String> getRemoteFiles(DbRule dbrule, String[] localfilenames, String requested,
+                                              NetworkTransaction networkTransaction) {
+        List<String> files = new ArrayList<String>();
+        for (String filename : localfilenames) {
+            if (!(filename.contains("*") || filename.contains("?") || filename.contains("~"))) {
+                files.add(filename);
+            } else {
+                // remote query
+                R66Future futureInfo = new R66Future(true);
+                logger.info(Messages.getString("Transfer.3") + filename + " to " + requested); //$NON-NLS-1$
+                RequestInformation info = new RequestInformation(
+                    futureInfo, requested, rulename, filename,
+                    (byte) InformationPacket.ASKENUM.ASKLIST.ordinal(), -1, false, networkTransaction);
+                info.run();
+                futureInfo.awaitUninterruptibly();
+                if (futureInfo.isSuccess()) {
+                    ValidPacket valid = (ValidPacket) futureInfo.getResult().getOther();
+                    if (valid != null) {
+                        String line = valid.getSheader();
+                        String[] lines = line.split("\n");
+                        for (String string : lines) {
+                            File tmpFile = new File(string);
+                            files.add(tmpFile.getPath());
+                        }
+                    }
+                } else {
+                    logger.error(Messages.getString("Transfer.6") + filename + " to " + requested + ": " +
+                                 (futureInfo.getCause() == null ? "" : futureInfo.getCause().getMessage())); //$NON-NLS-1$
+                }
+            }
+        }
+        return files;
+    }
+
+    public List<String> getLocalFiles(DbRule dbrule, String[] localfilenames) {
+        List<String> files = new ArrayList<String>();
+        R66Session session = new R66Session();
+        session.getAuth().specialNoSessionAuth(false, Configuration.configuration.getHOST_ID());
+        R66Dir dir = new R66Dir(session);
+        try {
+            dir.changeDirectory(dbrule.getSendPath());
+        } catch (CommandAbstractException e) {
+        }
+        if (localfilenames != null) {
+            for (String filename : localfilenames) {
+                if (!(filename.contains("*") || filename.contains("?") || filename.contains("~"))) {
+                    logger.info("Direct add: " + filename);
+                    files.add(filename);
+                } else {
+                    // local: must check
+                    logger.info("Local Ask for " + filename + " from " + dir.getFullPath());
+                    List<String> list;
+                    try {
+                        list = dir.list(filename);
+                        if (list != null) {
+                            files.addAll(list);
+                        }
+                    } catch (CommandAbstractException e) {
+                        logger.warn(Messages.getString("Transfer.14") + filename + " : " + e.getMessage()); //$NON-NLS-1$
+                    }
+                }
+            }
+        }
+        return files;
+    }
+
 }
diff --git a/src/main/java/org/waarp/openr66/client/MultipleDirectTransfer.java b/src/main/java/org/waarp/openr66/client/MultipleDirectTransfer.java
index a34dc4978..2ee6350d6 100644
--- a/src/main/java/org/waarp/openr66/client/MultipleDirectTransfer.java
+++ b/src/main/java/org/waarp/openr66/client/MultipleDirectTransfer.java
@@ -17,11 +17,9 @@
  */
 package org.waarp.openr66.client;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.waarp.common.command.exception.CommandAbstractException;
 import org.waarp.common.database.exception.WaarpDatabaseException;
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.common.logging.WaarpSlf4JLoggerFactory;
@@ -30,14 +28,10 @@
 import org.waarp.openr66.client.utils.OutputFormat.FIELDS;
 import org.waarp.openr66.context.ErrorCode;
 import org.waarp.openr66.context.R66Result;
-import org.waarp.openr66.context.R66Session;
-import org.waarp.openr66.context.filesystem.R66Dir;
 import org.waarp.openr66.database.DbConstant;
 import org.waarp.openr66.database.data.DbRule;
 import org.waarp.openr66.protocol.configuration.Configuration;
 import org.waarp.openr66.protocol.configuration.Messages;
-import org.waarp.openr66.protocol.localhandler.packet.InformationPacket;
-import org.waarp.openr66.protocol.localhandler.packet.ValidPacket;
 import org.waarp.openr66.protocol.networkhandler.NetworkTransaction;
 import org.waarp.openr66.protocol.utils.ChannelUtils;
 import org.waarp.openr66.protocol.utils.R66Future;
@@ -72,71 +66,6 @@ public MultipleDirectTransfer(R66Future future, String remoteHost,
         super(future, remoteHost, filename, rulename, fileinfo, isMD5, blocksize, id, networkTransaction);
     }
 
-    public static List<String> getRemoteFiles(DbRule dbrule, String[] localfilenames, String requested,
-            NetworkTransaction networkTransaction) {
-        List<String> files = new ArrayList<String>();
-        for (String filename : localfilenames) {
-            if (!(filename.contains("*") || filename.contains("?") || filename.contains("~"))) {
-                files.add(filename);
-            } else {
-                // remote query
-                R66Future futureInfo = new R66Future(true);
-                logger.info(Messages.getString("Transfer.3") + filename + " to " + requested); //$NON-NLS-1$
-                RequestInformation info = new RequestInformation(futureInfo, requested, rule, filename,
-                        (byte) InformationPacket.ASKENUM.ASKLIST.ordinal(), -1, false, networkTransaction);
-                info.run();
-                futureInfo.awaitUninterruptibly();
-                if (futureInfo.isSuccess()) {
-                    ValidPacket valid = (ValidPacket) futureInfo.getResult().getOther();
-                    if (valid != null) {
-                        String line = valid.getSheader();
-                        String[] lines = line.split("\n");
-                        for (String string : lines) {
-                            File tmpFile = new File(string);
-                            files.add(tmpFile.getPath());
-                        }
-                    }
-                } else {
-                    logger.error(Messages.getString("Transfer.6") + filename + " to " + requested + ": " +
-                            (futureInfo.getCause() == null ? "" : futureInfo.getCause().getMessage())); //$NON-NLS-1$
-                }
-            }
-        }
-        return files;
-    }
-
-    public static List<String> getLocalFiles(DbRule dbrule, String[] localfilenames) {
-        List<String> files = new ArrayList<String>();
-        R66Session session = new R66Session();
-        session.getAuth().specialNoSessionAuth(false, Configuration.configuration.getHOST_ID());
-        R66Dir dir = new R66Dir(session);
-        try {
-            dir.changeDirectory(dbrule.getSendPath());
-        } catch (CommandAbstractException e) {
-        }
-        if (localfilenames != null) {
-            for (String filename : localfilenames) {
-                if (!(filename.contains("*") || filename.contains("?") || filename.contains("~"))) {
-                    logger.info("Direct add: " + filename);
-                    files.add(filename);
-                } else {
-                    // local: must check
-                    logger.info("Local Ask for " + filename + " from " + dir.getFullPath());
-                    List<String> list;
-                    try {
-                        list = dir.list(filename);
-                        if (list != null) {
-                            files.addAll(list);
-                        }
-                    } catch (CommandAbstractException e) {
-                        logger.warn(Messages.getString("Transfer.14") + filename + " : " + e.getMessage()); //$NON-NLS-1$
-                    }
-                }
-            }
-        }
-        return files;
-    }
-
     @Override
     public void run() {
         String[] localfilenames = filename.split(",");
@@ -169,7 +98,7 @@ public void run() {
                         long time1 = System.currentTimeMillis();
                         R66Future future = new R66Future(true);
                         DirectTransfer transaction = new DirectTransfer(future,
-                                host, filename, rule, fileInfo, ismd5, block, idt,
+                                host, filename, rulename, fileinfo, isMD5, blocksize, id,
                                 networkTransaction);
                         transaction.normalInfoAsWarn = normalInfoAsWarn;
                         logger.debug("rhost: " + host + ":" + transaction.remoteHost);
diff --git a/src/main/java/org/waarp/openr66/client/MultipleSubmitTransfer.java b/src/main/java/org/waarp/openr66/client/MultipleSubmitTransfer.java
index 722ffed14..6d2feee0b 100644
--- a/src/main/java/org/waarp/openr66/client/MultipleSubmitTransfer.java
+++ b/src/main/java/org/waarp/openr66/client/MultipleSubmitTransfer.java
@@ -83,7 +83,7 @@ public void run() {
         try {
             dbrule = new DbRule(rulename);
         } catch (WaarpDatabaseException e) {
-            logger.error(Messages.getString("SubmitTransfer.2") + rule); //$NON-NLS-1$
+            logger.error(Messages.getString("SubmitTransfer.2") + rulename); //$NON-NLS-1$
             if (DetectionUtils.isJunit()) {
                 return;
             }
@@ -100,7 +100,7 @@ public void run() {
         }
         List<String> files = null;
         if (dbrule.isSendMode()) {
-            files = MultipleDirectTransfer.getLocalFiles(dbrule, localfilenames);
+            files = getLocalFiles(dbrule, localfilenames);
         } else if (submit) {
             files = new ArrayList<String>();
             for (String string : localfilenames) {
@@ -111,15 +111,15 @@ public void run() {
             host = host.trim();
             if (host != null && !host.isEmpty()) {
                 if (!submit && dbrule.isRecvMode()) {
-                    files = MultipleDirectTransfer.getRemoteFiles(dbrule, localfilenames, host, networkTransaction);
+                    files = getRemoteFiles(dbrule, localfilenames, host, networkTransaction);
                 }
                 for (String filename : files) {
                     filename = filename.trim();
                     if (filename != null && !filename.isEmpty()) {
                         R66Future future = new R66Future(true);
-                        SubmitTransfer transaction = new SubmitTransfer(future,
-                                host, filename, rule, fileInfo, ismd5, block, idt,
-                                ttimestart);
+                        SubmitTransfer transaction = new SubmitTransfer(
+                            future, host, filename, rulename, fileinfo,
+                            isMD5, blocksize, id, startTime);
                         transaction.normalInfoAsWarn = normalInfoAsWarn;
                         transaction.run();
                         future.awaitUninterruptibly();
diff --git a/src/main/java/org/waarp/openr66/client/RequestTransfer.java b/src/main/java/org/waarp/openr66/client/RequestTransfer.java
index 5dca54fee..03e82d48f 100644
--- a/src/main/java/org/waarp/openr66/client/RequestTransfer.java
+++ b/src/main/java/org/waarp/openr66/client/RequestTransfer.java
@@ -231,148 +231,223 @@ public RequestTransfer(R66Future future, long specialId, String requested, Strin
     }
 
     public void run() {
-        if (logger == null) {
-            logger = WaarpLoggerFactory.getLogger(RequestTransfer.class);
-        }
         DbTaskRunner runner = null;
         try {
-            runner = new DbTaskRunner(null, null,
-                    specialId, requester, requested);
-            logger.info("Found previous Runner: " + runner.toString());
-        } catch (WaarpDatabaseException e) {
-            // Maybe we can ask to the remote
-            R66Future futureInfo = new R66Future(true);
-            RequestInformation requestInformation = new RequestInformation(futureInfo, requested, null, null,
-                    (byte) -1, specialId, true, networkTransaction);
-            requestInformation.normalInfoAsWarn = normalInfoAsWarn;
-            requestInformation.run();
-            futureInfo.awaitUninterruptibly();
-            if (futureInfo.isSuccess()) {
-                R66Result r66result = futureInfo.getResult();
-                ValidPacket info = (ValidPacket) r66result.getOther();
-                String xml = info.getSheader();
-                try {
-                    runner = DbTaskRunner.fromStringXml(xml, true);
-                    runner.changeUpdatedInfo(UpdatedInfo.TOSUBMIT);
-                    // useful ?
-                    CommanderNoDb.todoList.add(runner);
+            if (logger == null) {
+                logger = WaarpLoggerFactory.getLogger(RequestTransfer.class);
+            }
+            try {
+                runner = new DbTaskRunner(null, null,
+                                          specialId, requester, requested);
+                logger.info("Found previous Runner: " + runner.toString());
+            } catch (WaarpDatabaseException e) {
+                // Maybe we can ask to the remote
+                R66Future futureInfo = new R66Future(true);
+                RequestInformation requestInformation =
+                    new RequestInformation(futureInfo, requested, null, null,
+                                           (byte) -1, specialId, true,
+                                           networkTransaction);
+                requestInformation.normalInfoAsWarn = normalInfoAsWarn;
+                requestInformation.run();
+                futureInfo.awaitUninterruptibly();
+                if (futureInfo.isSuccess()) {
+                    R66Result r66result = futureInfo.getResult();
+                    ValidPacket info = (ValidPacket) r66result.getOther();
+                    String xml = info.getSheader();
+                    try {
+                        runner = DbTaskRunner.fromStringXml(xml, true);
+                        runner.changeUpdatedInfo(UpdatedInfo.TOSUBMIT);
+                        // useful ?
+                        CommanderNoDb.todoList.add(runner);
 
-                    logger.info("Get Runner from remote: " + runner.toString());
-                    if (runner.getSpecialId() == DbConstant.ILLEGALVALUE || !runner.isSender()) {
-                        logger.error(Messages.getString("RequestTransfer.18")); //$NON-NLS-1$
-                        future.setResult(new R66Result(new OpenR66DatabaseGlobalException(e), null, true,
+                        logger.info(
+                            "Get Runner from remote: " + runner.toString());
+                        if (runner.getSpecialId() == DbConstant.ILLEGALVALUE ||
+                            !runner.isSender()) {
+                            logger.error(Messages.getString(
+                                "RequestTransfer.18")); //$NON-NLS-1$
+                            future.setResult(new R66Result(
+                                new OpenR66DatabaseGlobalException(e), null,
+                                true,
                                 ErrorCode.Internal, null));
-                        future.setFailure(e);
-                        return;
-                    }
-                    if (runner.isAllDone()) {
-                        logger.error(Messages.getString("RequestTransfer.21")); //$NON-NLS-1$
-                        future.setResult(new R66Result(new OpenR66DatabaseGlobalException(e), null, true,
+                            future.setFailure(e);
+                            return;
+                        }
+                        if (runner.isAllDone()) {
+                            logger.error(Messages.getString(
+                                "RequestTransfer.21")); //$NON-NLS-1$
+                            future.setResult(new R66Result(
+                                new OpenR66DatabaseGlobalException(e), null,
+                                true,
                                 ErrorCode.Internal, null));
+                            future.setFailure(e);
+                            return;
+                        }
+                    } catch (OpenR66ProtocolBusinessException e1) {
+                        logger.error(Messages.getString(
+                            "RequestTransfer.18")); //$NON-NLS-1$
+                        future.setResult(new R66Result(
+                            new OpenR66DatabaseGlobalException(e1), null, true,
+                            ErrorCode.Internal, null));
                         future.setFailure(e);
                         return;
                     }
-                } catch (OpenR66ProtocolBusinessException e1) {
-                    logger.error(Messages.getString("RequestTransfer.18")); //$NON-NLS-1$
-                    future.setResult(new R66Result(new OpenR66DatabaseGlobalException(e1), null, true,
-                            ErrorCode.Internal, null));
+                } else {
+                    logger.error(
+                        Messages.getString("RequestTransfer.18")); //$NON-NLS-1$
+                    future.setResult(
+                        new R66Result(new OpenR66DatabaseGlobalException(e),
+                                      null, true,
+                                      ErrorCode.Internal, null));
                     future.setFailure(e);
                     return;
                 }
-            } else {
-                logger.error(Messages.getString("RequestTransfer.18")); //$NON-NLS-1$
-                future.setResult(new R66Result(new OpenR66DatabaseGlobalException(e), null, true,
-                        ErrorCode.Internal, null));
-                future.setFailure(e);
-                return;
             }
-        }
-        if (cancel || stop || restart) {
-            if (cancel) {
-                // Cancel the task and delete any file if in retrieve
-                if (runner.isAllDone()) {
-                    // nothing to do since already finished
-                    setDone(runner);
-                    logger.info("Transfer already finished: " + runner.toString());
-                    future.setResult(new R66Result(null, true, ErrorCode.TransferOk, runner));
-                    future.getResult().setRunner(runner);
-                    future.setSuccess();
-                    return;
-                } else {
-                    // Send a request of cancel
-                    ErrorCode code = sendStopOrCancel(runner, LocalPacketFactory.CANCELPACKET);
-                    switch (code) {
+            if (cancel || stop || restart) {
+                if (cancel) {
+                    // Cancel the task and delete any file if in retrieve
+                    if (runner.isAllDone()) {
+                        // nothing to do since already finished
+                        setDone(runner);
+                        logger.info(
+                            "Transfer already finished: " + runner.toString());
+                        future.setResult(
+                            new R66Result(null, true, ErrorCode.TransferOk,
+                                          runner));
+                        future.getResult().setRunner(runner);
+                        future.setSuccess();
+                        return;
+                    } else {
+                        // Send a request of cancel
+                        ErrorCode code = sendStopOrCancel(runner,
+                                                          LocalPacketFactory.CANCELPACKET);
+                        future.setResult(
+                            new R66Result(null, true, code,
+                                          runner));
+                        future.getResult().setRunner(runner);
+                        switch (code) {
                         case CompleteOk:
-                            logger.info("Transfer cancel requested and done: {}",
-                                    runner);
+                            logger
+                                .info("Transfer cancel requested and done: {}",
+                                      runner);
+                            future.setSuccess();
                             break;
                         case TransferOk:
-                            logger.info("Transfer cancel requested but already finished: {}",
-                                    runner);
+                            logger.info(
+                                "Transfer cancel requested but already finished: {}",
+                                runner);
+                            future.setSuccess();
                             break;
                         default:
-                            logger.info("Transfer cancel requested but internal error: {}",
-                                    runner);
+                            logger.info(
+                                "Transfer cancel requested but internal error: {}",
+                                runner);
+                            future.setFailure(new WaarpDatabaseException("Transfer cancel requested but internal error"));
                             break;
+                        }
                     }
-                }
-            } else if (stop) {
-                // Just stop the task
-                // Send a request
-                ErrorCode code = sendStopOrCancel(runner, LocalPacketFactory.STOPPACKET);
-                switch (code) {
+                } else if (stop) {
+                    // Just stop the task
+                    // Send a request
+                    ErrorCode code =
+                        sendStopOrCancel(runner, LocalPacketFactory.STOPPACKET);
+                    future.setResult(
+                        new R66Result(null, true, code,
+                                      runner));
+                    future.getResult().setRunner(runner);
+                    switch (code) {
                     case CompleteOk:
-                        logger.info("Transfer stop requested and done: {}", runner);
+                        logger.info("Transfer stop requested and done: {}",
+                                    runner);
+                        future.setSuccess();
                         break;
                     case TransferOk:
-                        logger.info("Transfer stop requested but already finished: {}",
-                                runner);
+                        logger.info(
+                            "Transfer stop requested but already finished: {}",
+                            runner);
+                        future.setSuccess();
                         break;
                     default:
-                        logger.info("Transfer stop requested but internal error: {}",
-                                runner);
+                        logger.info(
+                            "Transfer stop requested but internal error: {}",
+                            runner);
+                        future.setFailure(new WaarpDatabaseException("Transfer stop requested but internal error"));
                         break;
-                }
-            } else if (restart) {
-                // Restart if already stopped and not finished
-                ErrorCode code = sendValid(runner, LocalPacketFactory.VALIDPACKET);
-                switch (code) {
+                    }
+                } else if (restart) {
+                    // Restart if already stopped and not finished
+                    ErrorCode code =
+                        sendValid(runner, LocalPacketFactory.VALIDPACKET);
+                    future.setResult(
+                        new R66Result(null, true, code,
+                                      runner));
+                    future.getResult().setRunner(runner);
+                    switch (code) {
                     case QueryStillRunning:
                         logger.info(
-                                "Transfer restart requested but already active and running: {}",
-                                runner);
+                            "Transfer restart requested but already active and running: {}",
+                            runner);
+                        future.setSuccess();
                         break;
                     case Running:
-                        logger.info("Transfer restart requested but already running: {}",
-                                runner);
+                        logger.info(
+                            "Transfer restart requested but already running: {}",
+                            runner);
+                        future.setSuccess();
                         break;
                     case PreProcessingOk:
-                        logger.info("Transfer restart requested and restarted: {}",
-                                runner);
+                        logger.info(
+                            "Transfer restart requested and restarted: {}",
+                            runner);
+                        future.setSuccess();
                         break;
                     case CompleteOk:
-                        logger.info("Transfer restart requested but already finished: {}",
-                                runner);
+                        logger.info(
+                            "Transfer restart requested but already finished: {}",
+                            runner);
+                        future.setSuccess();
                         break;
                     case RemoteError:
-                        logger.info("Transfer restart requested but remote error: {}",
-                                runner);
+                        logger.info(
+                            "Transfer restart requested but remote error: {}",
+                            runner);
+                        future.setSuccess();
                         break;
                     case PassThroughMode:
-                        logger.info("Transfer not restarted since it is in PassThrough mode: {}",
-                                runner);
+                        logger.info(
+                            "Transfer not restarted since it is in PassThrough mode: {}",
+                            runner);
+                        future.setSuccess();
                         break;
                     default:
-                        logger.info("Transfer restart requested but internal error: {}",
-                                runner);
+                        logger.info(
+                            "Transfer restart requested but internal error: {}",
+                            runner);
+                        future.setFailure(new WaarpDatabaseException("Transfer restart requested but internal error"));
                         break;
+                    }
+                }
+            } else {
+                // Only request
+                logger.info(
+                    "Transfer information: {}    " + runner.toShortString(),
+                    future.isDone());
+                future.setResult(
+                    new R66Result(null, true, runner.getErrorInfo(), runner));
+                future.setSuccess();
+            }
+        } finally {
+            if (!future.isDone()) {
+                if (runner != null) {
+                    // Default set to success
+                    future.setResult(
+                        new R66Result(null, true, runner.getErrorInfo(),
+                                      runner));
+                    future.setSuccess();
+                } else {
+                    future.setFailure(new WaarpDatabaseException("Transfer requested but internal error"));
                 }
             }
-        } else {
-            // Only request
-            logger.info("Transfer information:     " + runner.toShortString());
-            future.setResult(new R66Result(null, true, runner.getErrorInfo(), runner));
-            future.setSuccess();
         }
     }
 
diff --git a/src/main/java/org/waarp/openr66/configuration/FileBasedConfiguration.java b/src/main/java/org/waarp/openr66/configuration/FileBasedConfiguration.java
index 500b4f9f7..95b72c54b 100644
--- a/src/main/java/org/waarp/openr66/configuration/FileBasedConfiguration.java
+++ b/src/main/java/org/waarp/openr66/configuration/FileBasedConfiguration.java
@@ -1801,6 +1801,7 @@ private static boolean loadDatabase(Configuration config, boolean initdb) {
                 }
                 DbConstant.admin = new DbAdmin(); // no database support
                 DbConstant.noCommitAdmin = DbConstant.admin;
+                DAOFactory.initialize();
             } else {
                 String dbdriver = value.getString();
                 value = hashConfig.get(XML_DBSERVER);
diff --git a/src/main/java/org/waarp/openr66/configuration/RuleFileBasedConfiguration.java b/src/main/java/org/waarp/openr66/configuration/RuleFileBasedConfiguration.java
index 348ee767d..7b9174c12 100644
--- a/src/main/java/org/waarp/openr66/configuration/RuleFileBasedConfiguration.java
+++ b/src/main/java/org/waarp/openr66/configuration/RuleFileBasedConfiguration.java
@@ -150,6 +150,7 @@ public static void importRules(File configDirectory)
         File[] files = FileUtils.getFiles(configDirectory,
                 new ExtensionFilter(EXT_RULE));
         for (File file : files) {
+            logger.info("Load rule from {}", file.getAbsolutePath());
             DbRule rule = getFromFile(file);
             logger.debug(rule.toString());
         }
@@ -238,7 +239,8 @@ public static String[] getHostIds(XmlValue value) {
         String[] idsArray = new String[0];
         if (value == null || (value.getList() == null) || value.getList().isEmpty()) {
             logger
-                    .info("Unable to find the Hostid for Rule, setting to the default");
+                    .debug("Unable to find the Hostid for Rule, setting to " +
+                           "the default");
         } else {
             @SuppressWarnings("unchecked")
             List<String> ids = (List<String>) value.getList();
@@ -588,7 +590,9 @@ private static void addToElement(Element element, DbRule rule) {
                 task.add(newElement(DbRule.TASK_TYPE, array[rank][0]));
                 task.add(newElement(DbRule.TASK_PATH, array[rank][1]));
                 task.add(newElement(DbRule.TASK_DELAY, array[rank][2]));
-                task.add(newElement(DbRule.TASK_COMMENT, array[rank][3]));
+                if (array[rank].length > 3) {
+                    task.add(newElement(DbRule.TASK_COMMENT, array[rank][3]));
+                }
                 roottasks.add(task);
             }
         }
diff --git a/src/main/java/org/waarp/openr66/dao/BusinessDAO.java b/src/main/java/org/waarp/openr66/dao/BusinessDAO.java
index bdbc7d027..c09bcf9c8 100644
--- a/src/main/java/org/waarp/openr66/dao/BusinessDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/BusinessDAO.java
@@ -2,7 +2,8 @@
 
 import java.util.List;
 
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Business;
 
 /**
@@ -13,27 +14,29 @@ public interface BusinessDAO {
     /**
      * Retrieve all Business objects in a List from the persistance layer
      *
-     * @throws DAOException If data access error occurs
+     * @throws DAOConnectionException If data access error occurs
      */
-    List<Business> getAll() throws DAOException;
+    List<Business> getAll() throws DAOConnectionException;
 
     /**
      * Retrieve all Business objects corresponding to the given filters
      * in a List from the persistance layer
      *
      * @param filters List of filter
-     * @throws DAOException If data access error occurs
+     * @throws DAOConnectionException If data access error occurs
      */
-    List<Business> find(List<Filter> filters) throws DAOException;
+    List<Business> find(List<Filter> filters) throws DAOConnectionException;
 
     /**
      * Retrieve the Business object with the specified hostid from the
      * persistance layer
      *
      * @param hostid Hostid of the Business object requested
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    Business select(String hostid) throws DAOException;
+    Business select(String hostid)
+        throws DAOConnectionException, DAONoDataException;
 
     /**
      * Verify if a Business object with the specified hostid exists in
@@ -42,40 +45,44 @@ public interface BusinessDAO {
      * @param hostid Hostid of the Business object verified
      * @return true if a Business object with the specified hostid exist; false
      * if no Business object correspond to the specified hostid.
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    boolean exist(String hostid) throws DAOException;
+    boolean exist(String hostid) throws DAOConnectionException;
 
     /**
      * Insert the specified Business object in the persistance layer
      *
      * @param business Business object to insert
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    void insert(Business business) throws DAOException;
+    void insert(Business business) throws DAOConnectionException;
 
     /**
      * Update the specified Business object in the persistance layer
      *
      * @param business Business object to update
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    void update(Business business) throws DAOException;
+    void update(Business business)
+        throws DAOConnectionException, DAONoDataException;
 
     /**
      * Remove the specified Business object from the persistance layer
      *
      * @param business Business object to insert
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    void delete(Business business) throws DAOException;
+    void delete(Business business)
+        throws DAOConnectionException, DAONoDataException;
 
     /**
      * Remove all Business objects from the persistance layer
      *
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    void deleteAll() throws DAOException;
+    void deleteAll() throws DAOConnectionException;
 
     void close();
 }
diff --git a/src/main/java/org/waarp/openr66/dao/DAOFactory.java b/src/main/java/org/waarp/openr66/dao/DAOFactory.java
index 707155054..91cf827b7 100644
--- a/src/main/java/org/waarp/openr66/dao/DAOFactory.java
+++ b/src/main/java/org/waarp/openr66/dao/DAOFactory.java
@@ -1,8 +1,9 @@
 package org.waarp.openr66.dao;
 
 import org.waarp.common.database.ConnectionFactory;
+import org.waarp.common.utility.DetectionUtils;
 import org.waarp.openr66.dao.database.DBDAOFactory;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 import org.waarp.openr66.dao.xml.XMLDAOFactory;
 
 
@@ -33,48 +34,48 @@ public static DAOFactory getInstance() {
      * Return a BusinessDAO
      *
      * @return a ready to use BusinessDAO
-     * @throws DAOException if cannot create the DAO
+     * @throws DAOConnectionException if cannot create the DAO
      */
-    public abstract BusinessDAO getBusinessDAO() throws DAOException;
+    public abstract BusinessDAO getBusinessDAO() throws DAOConnectionException;
 
     /**
      * Return a HostDAO
      *
      * @return a ready to use HostDAO
-     * @throws DAOException if cannot create the DAO
+     * @throws DAOConnectionException if cannot create the DAO
      */
-    public abstract HostDAO getHostDAO() throws DAOException;
+    public abstract HostDAO getHostDAO() throws DAOConnectionException;
 
     /**
      * Return a LimitDAO
      *
      * @return a ready to use LimitDAO
-     * @throws DAOException if cannot create the DAO
+     * @throws DAOConnectionException if cannot create the DAO
      */
-    public abstract LimitDAO getLimitDAO() throws DAOException;
+    public abstract LimitDAO getLimitDAO() throws DAOConnectionException;
 
     /**
      * Return a MultipleMonitorDAO
      *
      * @return a ready to use MultipleMonitorDAO
-     * @throws DAOException if cannot create the DAO
+     * @throws DAOConnectionException if cannot create the DAO
      */
     public abstract MultipleMonitorDAO getMultipleMonitorDAO()
-            throws DAOException;
+        throws DAOConnectionException;
 
     /**
      * Return a RuleDAO
      *
      * @return a ready to use RuleDAO
-     * @throws DAOException if cannot create the DAO
+     * @throws DAOConnectionException if cannot create the DAO
      */
-    public abstract RuleDAO getRuleDAO() throws DAOException;
+    public abstract RuleDAO getRuleDAO() throws DAOConnectionException;
 
     /**
      * Return a TransferDAO
      *
      * @return a ready to use TramsferDAO
-     * @throws DAOException if cannot create the DAO
+     * @throws DAOConnectionException if cannot create the DAO
      */
-    public abstract TransferDAO getTransferDAO() throws DAOException;
+    public abstract TransferDAO getTransferDAO() throws DAOConnectionException;
 }
diff --git a/src/main/java/org/waarp/openr66/dao/HostDAO.java b/src/main/java/org/waarp/openr66/dao/HostDAO.java
index 845847bdb..52006466b 100644
--- a/src/main/java/org/waarp/openr66/dao/HostDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/HostDAO.java
@@ -2,7 +2,8 @@
 
 import java.util.List;
 
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Host;
 
 /**
@@ -13,25 +14,27 @@ public interface HostDAO {
     /**
      * Retrieve all Host objects in a List from the persistance layer
      *
-     * @throws DAOException If data access error occurs
+     * @throws DAOConnectionException If data access error occurs
      */
-    List<Host> getAll() throws DAOException;
+    List<Host> getAll() throws DAOConnectionException;
 
     /**
      * Retrieve all Host objects corresponding to the given filters
      * in a List from the persistance lsayer
      *
      * @param filters List of filter
-     * @throws DAOException If data access error occurs
+     * @throws DAOConnectionException If data access error occurs
      */
-    List<Host> find(List<Filter> filters) throws DAOException;
+    List<Host> find(List<Filter> filters) throws DAOConnectionException;
     /**
      * Retrieve the Host object with the specified hostid from the persistance layer
      *
      * @param hostid Hostid of the Host object requested
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    Host select(String hostid) throws DAOException;
+    Host select(String hostid) throws DAOConnectionException,
+                                      DAONoDataException;
 
     /**
      * Verify if a Host object with the specified hostid exists in
@@ -40,40 +43,42 @@ public interface HostDAO {
      * @param hostid Hostid of the Host object verified
      * @return true if a Host object with the specified hostid exist; false
      * if no Host object correspond to the specified hostid.
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    boolean exist(String hostid) throws DAOException;
+    boolean exist(String hostid) throws DAOConnectionException;
 
     /**
      * Insert the specified Host object in the persistance layer
      *
      * @param host Host object to insert
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    void insert(Host host) throws DAOException;
+    void insert(Host host) throws DAOConnectionException;
 
     /**
      * Update the specified Host object in the persistance layer
      *
      * @param host Host object to update
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    void update(Host host) throws DAOException;
+    void update(Host host) throws DAOConnectionException, DAONoDataException;
 
     /**
      * Remove the specified Host object from the persistance layer
      *
      * @param host Host object to insert
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    void delete(Host host) throws DAOException;
+    void delete(Host host) throws DAOConnectionException, DAONoDataException;
 
     /**
      * Remove all Host objects from the persistance layer
      *
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    void deleteAll() throws DAOException;
+    void deleteAll() throws DAOConnectionException;
 
     void close();
 }
diff --git a/src/main/java/org/waarp/openr66/dao/LimitDAO.java b/src/main/java/org/waarp/openr66/dao/LimitDAO.java
index d9e3fbb63..212953eca 100644
--- a/src/main/java/org/waarp/openr66/dao/LimitDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/LimitDAO.java
@@ -2,7 +2,8 @@
 
 import java.util.List;
 
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Limit;
 
 /**
@@ -13,25 +14,27 @@ public interface LimitDAO {
     /**
      * Retrieve all Limit objects in a List from the persistance layer
      *
-     * @throws DAOException If data access error occurs
+     * @throws DAOConnectionException If data access error occurs
      */
-    List<Limit> getAll() throws DAOException;
+    List<Limit> getAll() throws DAOConnectionException;
 
     /**
      * Retrieve all Limit objects correspondig to the given filters
      * in a List from the persistance layer
      *
      * @param filters List of filter
-     * @throws DAOException If data access error occurs
+     * @throws DAOConnectionException If data access error occurs
      */
-    List<Limit> find(List<Filter> filters) throws DAOException;
+    List<Limit> find(List<Filter> filters) throws DAOConnectionException;
     /**
      * Retrieve the Limit object with the specified hostid from the persistance layer
      *
      * @param hostid Hostid of the Limit object requested
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    Limit select(String hostid) throws DAOException;
+    Limit select(String hostid)
+        throws DAOConnectionException, DAONoDataException;
 
     /**
      * Verify if a Limit object with the specified hostid exists in
@@ -40,40 +43,42 @@ public interface LimitDAO {
      * @param hostid Hostid of the Limit object verified
      * @return true if a Limit object with the specified hostid exist; false
      * if no Limit object correspond to the specified hostid.
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    boolean exist(String hostid) throws DAOException;
+    boolean exist(String hostid) throws DAOConnectionException;
 
     /**
      * Insert the specified Limit object in the persistance layer
      *
      * @param limit Limit object to insert
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    void insert(Limit limit) throws DAOException;
+    void insert(Limit limit) throws DAOConnectionException;
 
     /**
      * Update the specified Limit object in the persistance layer
      *
      * @param limit Limit object to update
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    void update(Limit limit) throws DAOException;
+    void update(Limit limit) throws DAOConnectionException, DAONoDataException;
 
     /**
      * Remove the specified Limit object from the persistance layer
      *
      * @param limit Limit object to insert
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    void delete(Limit limit) throws DAOException;
+    void delete(Limit limit) throws DAOConnectionException, DAONoDataException;
 
     /**
      * Remove all Limit objects from the persistance layer
      *
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    void deleteAll() throws DAOException;
+    void deleteAll() throws DAOConnectionException;
 
     void close();
 }
diff --git a/src/main/java/org/waarp/openr66/dao/MultipleMonitorDAO.java b/src/main/java/org/waarp/openr66/dao/MultipleMonitorDAO.java
index d3e634a19..34196cf17 100644
--- a/src/main/java/org/waarp/openr66/dao/MultipleMonitorDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/MultipleMonitorDAO.java
@@ -2,7 +2,8 @@
 
 import java.util.List;
 
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.MultipleMonitor;
 
 /**
@@ -13,26 +14,29 @@ public interface MultipleMonitorDAO {
     /**
      * Retrieve all MultipleMonitor objects in a List from the persistance layer
      *
-     * @throws DAOException If data access error occurs
+     * @throws DAOConnectionException If data access error occurs
      */
-    List<MultipleMonitor> getAll() throws DAOException;
+    List<MultipleMonitor> getAll() throws DAOConnectionException;
 
     /**
      * Retrieve all MultipleMonitor objects corresponding to the given filters
      * in a List from the persistance layer
      *
      * @param filters List of filter
-     * @throws DAOException If data access error occurs
+     * @throws DAOConnectionException If data access error occurs
      */
-    List<MultipleMonitor> find(List<Filter> filters) throws DAOException;
+    List<MultipleMonitor> find(List<Filter> filters) throws
+                                                     DAOConnectionException;
 
     /**
      * Retrieve the MultipleMonitor object with the specified hostid from the persistance layer
      *
      * @param hostid Hostid of the MultipleMonitor object requested
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    MultipleMonitor select(String hostid) throws DAOException;
+    MultipleMonitor select(String hostid)
+        throws DAOConnectionException, DAONoDataException;
 
     /**
      * Verify if a MultipleMonitor object with the specified hostid exists in
@@ -41,40 +45,44 @@ public interface MultipleMonitorDAO {
      * @param hostid Hostid of the MultipleMonitor object verified
      * @return true if a MultipleMonitor object with the specified hostid exist; false
      * if no MultipleMonitor object correspond to the specified hostid.
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    boolean exist(String hostid) throws DAOException;
+    boolean exist(String hostid) throws DAOConnectionException;
 
     /**
      * Insert the specified MultipleMonitor object in the persistance layer
      *
      * @param multipleMonitor MultipleMonitor object to insert
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    void insert(MultipleMonitor multipleMonitor) throws DAOException;
+    void insert(MultipleMonitor multipleMonitor) throws DAOConnectionException;
 
     /**
      * Update the specified MultipleMonitor object in the persistance layer
      *
      * @param multipleMonitor MultipleMonitor object to update
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    void update(MultipleMonitor multipleMonitor) throws DAOException;
+    void update(MultipleMonitor multipleMonitor)
+        throws DAOConnectionException, DAONoDataException;
 
     /**
      * Remove the specified MultipleMonitor object from the persistance layer
      *
      * @param multipleMonitor MultipleMonitor object to insert
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    void delete(MultipleMonitor multipleMonitor) throws DAOException;
+    void delete(MultipleMonitor multipleMonitor)
+        throws DAOConnectionException, DAONoDataException;
 
     /**
      * Remove all MultipleMonitor objects from the persistance layer
      *
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    void deleteAll() throws DAOException;
+    void deleteAll() throws DAOConnectionException;
 
     void close();
 }
diff --git a/src/main/java/org/waarp/openr66/dao/RuleDAO.java b/src/main/java/org/waarp/openr66/dao/RuleDAO.java
index f054c1d58..77d86b435 100644
--- a/src/main/java/org/waarp/openr66/dao/RuleDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/RuleDAO.java
@@ -2,7 +2,8 @@
 
 import java.util.List;
 
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Rule;
 
 /**
@@ -13,27 +14,29 @@ public interface RuleDAO {
     /**
      * Retrieve all Rule objects in a List from the persistance layer
      *
-     * @throws DAOException If data access error occurs
+     * @throws DAOConnectionException If data access error occurs
      */
-    List<Rule> getAll() throws DAOException;
+    List<Rule> getAll() throws DAOConnectionException;
 
     /**
      * Retrieve all Rule objects corresponding to the given filters
      * a List from the persistance layer
      *
      * @param filters List of filter
-     * @throws DAOException If data access error occurs
+     * @throws DAOConnectionException If data access error occurs
      */
-    List<Rule> find(List<Filter> filters) throws DAOException;
+    List<Rule> find(List<Filter> filters) throws DAOConnectionException;
 
     /**
      * Retrieve the Rule object with the specified Rulename from the
      * persistance layer
      *
      * @param rulename rulename of the Rule object requested
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    Rule select(String rulename) throws DAOException;
+    Rule select(String rulename)
+        throws DAOConnectionException, DAONoDataException;
 
     /**
      * Verify if a Rule object with the specified Rulename exists in
@@ -42,40 +45,42 @@ public interface RuleDAO {
      * @param rulename rulename of the Rule object verified
      * @return true if a Rule object with the specified Rulename exist; false
      * if no Rule object correspond to the specified Rulename.
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    boolean exist(String rulename) throws DAOException;
+    boolean exist(String rulename) throws DAOConnectionException;
 
     /**
      * Insert the specified Rule object in the persistance layer
      *
      * @param rule Rule object to insert
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    void insert(Rule rule) throws DAOException;
+    void insert(Rule rule) throws DAOConnectionException;
 
     /**
      * Update the specified Rule object in the persistance layer
      *
      * @param rule Rule object to update
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    void update(Rule rule) throws DAOException;
+    void update(Rule rule) throws DAOConnectionException, DAONoDataException;
 
     /**
      * Remove the specified Rule object from the persistance layer
      *
      * @param rule Rule object to insert
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    void delete(Rule rule) throws DAOException;
+    void delete(Rule rule) throws DAOConnectionException, DAONoDataException;
 
     /**
      * Remove all Rule objects from the persistance layer
      *
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    void deleteAll() throws DAOException;
+    void deleteAll() throws DAOConnectionException;
 
     void close();
 }
diff --git a/src/main/java/org/waarp/openr66/dao/TransferDAO.java b/src/main/java/org/waarp/openr66/dao/TransferDAO.java
index 711f110b0..68a43ebd8 100644
--- a/src/main/java/org/waarp/openr66/dao/TransferDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/TransferDAO.java
@@ -2,7 +2,8 @@
 
 import java.util.List;
 
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Transfer;
 
 /**
@@ -13,43 +14,80 @@ public interface TransferDAO {
     /**
      * Retrieve all Transfer objects in a List from the persistance layer
      *
-     * @throws DAOException If data access error occurs
+     * @throws DAOConnectionException If data access error occurs
      */
-    List<Transfer> getAll() throws DAOException;
+    List<Transfer> getAll() throws DAOConnectionException;
 
     /**
      * Retrieve all Transfer objects to the given filters
      * in a List from the persistance layer
      *
      * @param filters List of filter
-     * @throws DAOException If data access error occurs
+     * @throws DAOConnectionException If data access error occurs
      */
-    List<Transfer> find(List<Filter> filters) throws DAOException;
+    List<Transfer> find(List<Filter> filters) throws DAOConnectionException;
 
-    List<Transfer> find(List<Filter> filters, int limit) throws DAOException;
+    /**
+     * Retrieve all Transfer objects to the given filters
+     * in a List from the persistance layer
+     *
+     * @param filters List of filter
+     * @throws DAOConnectionException If data access error occurs
+     */
+    List<Transfer> find(List<Filter> filters, int limit) throws
+                                                         DAOConnectionException;
 
+    /**
+     * Retrieve all Transfer objects to the given filters
+     * in a List from the persistance layer
+     *
+     * @param filters List of filter
+     * @throws DAOConnectionException If data access error occurs
+     */
     List<Transfer> find(List<Filter> filters, int limit, int offset)
-            throws DAOException;
+        throws DAOConnectionException;
 
 
+    /**
+     * Retrieve all Transfer objects to the given filters
+     * in a List from the persistance layer
+     *
+     * @param filters List of filter
+     * @throws DAOConnectionException If data access error occurs
+     */
     List<Transfer> find(List<Filter> filters, String column, boolean ascend)
-            throws DAOException;
+        throws DAOConnectionException;
 
+    /**
+     * Retrieve all Transfer objects to the given filters
+     * in a List from the persistance layer
+     *
+     * @param filters List of filter
+     * @throws DAOConnectionException If data access error occurs
+     */
     List<Transfer> find(List<Filter> filters, String column, boolean ascend,
-                        int limit) throws DAOException;
+                        int limit) throws DAOConnectionException;
 
+    /**
+     * Retrieve all Transfer objects to the given filters
+     * in a List from the persistance layer
+     *
+     * @param filters List of filter
+     * @throws DAOConnectionException If data access error occurs
+     */
     List<Transfer> find(List<Filter> filters, String column, boolean ascend,
-                        int limit, int offset) throws DAOException;
+                        int limit, int offset) throws DAOConnectionException;
 
 
     /**
      * Retrieve the Transfer object with the specified Special ID from the persistance layer
      *
      * @param id special ID of the Transfer object requested
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
     Transfer select(long id, String requester, String requested, String owner)
-            throws DAOException;
+        throws DAOConnectionException, DAONoDataException;
 
     /**
      * Verify if a Transfer object with the specified Special ID exists in
@@ -58,41 +96,45 @@ Transfer select(long id, String requester, String requested, String owner)
      * @param id special ID of the Transfer object verified
      * @return true if a Transfer object with the specified Special ID exist; false
      * if no Transfer object correspond to the specified Special ID.
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
     boolean exist(long id, String requester, String requested, String owner)
-            throws DAOException;
+        throws DAOConnectionException;
 
     /**
      * Insert the specified Transfer object in the persistance layer
      *
      * @param transfer Transfer object to insert
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    void insert(Transfer transfer) throws DAOException;
+    void insert(Transfer transfer) throws DAOConnectionException;
 
     /**
      * Update the specified Transfer object in the persistance layer
      *
      * @param transfer Transfer object to update
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    void update(Transfer transfer) throws DAOException;
+    void update(Transfer transfer)
+        throws DAOConnectionException, DAONoDataException;
 
     /**
      * Remove the specified Transfer object from the persistance layer
      *
      * @param transfer Transfer object to insert
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
+     * @throws  DAONoDataException if no data are available
      */
-    void delete(Transfer transfer) throws DAOException;
+    void delete(Transfer transfer)
+        throws DAOConnectionException, DAONoDataException;
 
     /**
      * Remove all Transfer objects from the persistance layer
      *
-     * @throws DAOException If a data access error occurs
+     * @throws DAOConnectionException If a data access error occurs
      */
-    void deleteAll() throws DAOException;
+    void deleteAll() throws DAOConnectionException;
 
     void close();
 }
diff --git a/src/main/java/org/waarp/openr66/dao/database/DBBusinessDAO.java b/src/main/java/org/waarp/openr66/dao/database/DBBusinessDAO.java
index 78dd2d2b8..18e1440a8 100644
--- a/src/main/java/org/waarp/openr66/dao/database/DBBusinessDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/database/DBBusinessDAO.java
@@ -12,7 +12,8 @@
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.openr66.dao.BusinessDAO;
 import org.waarp.openr66.dao.Filter;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Business;
 import org.waarp.openr66.pojo.UpdatedInfo;
 
@@ -71,34 +72,39 @@ public void close() {
     }
 
     @Override
-    public void delete(Business business) throws DAOException {
+    public void delete(Business business)
+        throws DAOConnectionException, DAONoDataException {
         PreparedStatement stm = null;
         try {
             stm = connection.prepareStatement(SQL_DELETE);
             setParameters(stm, business.getHostid());
-            executeUpdate(stm);
+            try {
+                executeUpdate(stm);
+            } catch (SQLException e2) {
+                throw new DAONoDataException(e2);
+            }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public void deleteAll() throws DAOException {
+    public void deleteAll() throws DAOConnectionException {
         PreparedStatement stm = null;
         try {
             stm = connection.prepareStatement(SQL_DELETE_ALL);
             executeUpdate(stm);
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public List<Business> getAll() throws DAOException {
+    public List<Business> getAll() throws DAOConnectionException {
         ArrayList<Business> businesses = new ArrayList<Business>();
         PreparedStatement stm = null;
         ResultSet res = null;
@@ -109,7 +115,7 @@ public List<Business> getAll() throws DAOException {
                 businesses.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -118,7 +124,8 @@ public List<Business> getAll() throws DAOException {
     }
 
     @Override
-    public List<Business> find(List<Filter> filters) throws DAOException {
+    public List<Business> find(List<Filter> filters) throws
+                                                     DAOConnectionException {
         ArrayList<Business> businesses = new ArrayList<Business>();
         // Create the SQL query
         StringBuilder query = new StringBuilder(SQL_GET_ALL);
@@ -148,7 +155,7 @@ public List<Business> find(List<Filter> filters) throws DAOException {
                 businesses.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -157,7 +164,7 @@ public List<Business> find(List<Filter> filters) throws DAOException {
     }
 
     @Override
-    public boolean exist(String hostid) throws DAOException {
+    public boolean exist(String hostid) throws DAOConnectionException {
         PreparedStatement stm = null;
         ResultSet res = null;
         try {
@@ -166,7 +173,7 @@ public boolean exist(String hostid) throws DAOException {
             res = executeQuery(stm);
             return res.next();
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -174,7 +181,8 @@ public boolean exist(String hostid) throws DAOException {
     }
 
     @Override
-    public Business select(String hostid) throws DAOException {
+    public Business select(String hostid)
+        throws DAOConnectionException, DAONoDataException {
         PreparedStatement stm = null;
         ResultSet res = null;
         try {
@@ -183,18 +191,19 @@ public Business select(String hostid) throws DAOException {
             res = executeQuery(stm);
             if (res.next()) {
                 return getFromResultSet(res);
+            } else {
+                throw new DAONoDataException(("No " + getClass().getName() + " found"));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
         }
-        return null;
     }
 
     @Override
-    public void insert(Business business) throws DAOException {
+    public void insert(Business business) throws DAOConnectionException {
         Object[] params = {
             business.getHostid(),
             business.getBusiness(),
@@ -210,14 +219,15 @@ public void insert(Business business) throws DAOException {
             setParameters(stm, params);
             executeUpdate(stm);
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public void update(Business business) throws DAOException {
+    public void update(Business business)
+        throws DAOConnectionException, DAONoDataException {
         Object[] params = {
             business.getHostid(),
             business.getBusiness(),
@@ -232,9 +242,13 @@ public void update(Business business) throws DAOException {
         try {
             stm = connection.prepareStatement(SQL_UPDATE);
             setParameters(stm, params);
-            executeUpdate(stm);
+            try {
+                executeUpdate(stm);
+            } catch (SQLException e2) {
+                throw new DAONoDataException(e2);
+            }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
diff --git a/src/main/java/org/waarp/openr66/dao/database/DBDAOFactory.java b/src/main/java/org/waarp/openr66/dao/database/DBDAOFactory.java
index 5ad8c3dd7..929de96f8 100644
--- a/src/main/java/org/waarp/openr66/dao/database/DBDAOFactory.java
+++ b/src/main/java/org/waarp/openr66/dao/database/DBDAOFactory.java
@@ -11,7 +11,7 @@
 import org.waarp.openr66.dao.database.mariadb.MariaDBTransferDAO;
 import org.waarp.openr66.dao.database.oracle.OracleTransferDAO;
 import org.waarp.openr66.dao.database.postgres.PostgreSQLTransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 
 /**
  * DAOFactory for standard SQL databases
@@ -27,52 +27,53 @@ public DBDAOFactory(ConnectionFactory factory) {
     }
 
     @Override
-    public DBBusinessDAO getBusinessDAO() throws DAOException {
+    public DBBusinessDAO getBusinessDAO() throws DAOConnectionException {
         try {
             return new DBBusinessDAO(connectionFactory.getConnection());
         } catch (SQLException e) {
-            throw new DAOException("data access error", e);
+            throw new DAOConnectionException("data access error", e);
         }
     }
 
     @Override
-    public DBHostDAO getHostDAO() throws DAOException {
+    public DBHostDAO getHostDAO() throws DAOConnectionException {
         try {
             return new DBHostDAO(connectionFactory.getConnection());
         } catch (SQLException e) {
-            throw new DAOException("data access error", e);
+            throw new DAOConnectionException("data access error", e);
         }
     }
 
     @Override
-    public DBLimitDAO getLimitDAO() throws DAOException {
+    public DBLimitDAO getLimitDAO() throws DAOConnectionException {
         try {
             return new DBLimitDAO(connectionFactory.getConnection());
         } catch (SQLException e) {
-            throw new DAOException("data access error", e);
+            throw new DAOConnectionException("data access error", e);
         }
     }
 
     @Override
-    public DBMultipleMonitorDAO getMultipleMonitorDAO() throws DAOException {
+    public DBMultipleMonitorDAO getMultipleMonitorDAO() throws
+                                                        DAOConnectionException {
         try {
             return new DBMultipleMonitorDAO(connectionFactory.getConnection());
         } catch (SQLException e) {
-            throw new DAOException("data access error", e);
+            throw new DAOConnectionException("data access error", e);
         }
     }
 
     @Override
-    public DBRuleDAO getRuleDAO() throws DAOException {
+    public DBRuleDAO getRuleDAO() throws DAOConnectionException {
         try {
             return new DBRuleDAO(connectionFactory.getConnection());
         } catch (SQLException e) {
-            throw new DAOException("data access error", e);
+            throw new DAOConnectionException("data access error", e);
         }
     }
 
     @Override
-    public DBTransferDAO getTransferDAO() throws DAOException {
+    public DBTransferDAO getTransferDAO() throws DAOConnectionException {
         try {
 	     DbProperties prop = connectionFactory.getProperties();
 	     if (prop instanceof H2Properties) {
@@ -86,10 +87,10 @@ public DBTransferDAO getTransferDAO() throws DAOException {
 	     } else if (prop instanceof PostgreSQLProperties) {
                  return new PostgreSQLTransferDAO(connectionFactory.getConnection());
 	     } else {
-	         throw new DAOException("Unsupported database");
+	         throw new DAOConnectionException("Unsupported database");
 	     }
         } catch (SQLException e) {
-            throw new DAOException("data access error", e);
+            throw new DAOConnectionException("data access error", e);
         }
     }
 
diff --git a/src/main/java/org/waarp/openr66/dao/database/DBHostDAO.java b/src/main/java/org/waarp/openr66/dao/database/DBHostDAO.java
index 53b0ac058..9d6a41c78 100644
--- a/src/main/java/org/waarp/openr66/dao/database/DBHostDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/database/DBHostDAO.java
@@ -12,7 +12,8 @@
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.openr66.dao.HostDAO;
 import org.waarp.openr66.dao.Filter;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Host;
 import org.waarp.openr66.pojo.UpdatedInfo;
 
@@ -69,7 +70,7 @@ public class DBHostDAO extends StatementExecutor implements HostDAO {
 
     protected Connection connection;
 
-    public DBHostDAO(Connection con) throws DAOException {
+    public DBHostDAO(Connection con) throws DAOConnectionException {
         this.connection = con;
     }
 
@@ -83,34 +84,39 @@ public void close() {
     }
 
     @Override
-    public void delete(Host host) throws DAOException {
+    public void delete(Host host)
+        throws DAOConnectionException, DAONoDataException {
         PreparedStatement stm = null;
         try {
             stm = connection.prepareStatement(SQL_DELETE);
             setParameters(stm, host.getHostid());
-            executeUpdate(stm);
+            try {
+                executeUpdate(stm);
+            } catch (SQLException e2) {
+                throw new DAONoDataException(e2);
+            }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public void deleteAll() throws DAOException {
+    public void deleteAll() throws DAOConnectionException {
         PreparedStatement stm = null;
         try {
             stm = connection.prepareStatement(SQL_DELETE_ALL);
             executeUpdate(stm);
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public List<Host> getAll() throws DAOException {
+    public List<Host> getAll() throws DAOConnectionException {
         ArrayList<Host> hosts = new ArrayList<Host>();
         PreparedStatement stm = null;
         ResultSet res = null;
@@ -121,7 +127,7 @@ public List<Host> getAll() throws DAOException {
                 hosts.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -130,7 +136,7 @@ public List<Host> getAll() throws DAOException {
     }
 
     @Override
-    public List<Host> find(List<Filter> filters) throws DAOException {
+    public List<Host> find(List<Filter> filters) throws DAOConnectionException {
         ArrayList<Host> hosts = new ArrayList<Host>();
         // Create the SQL query
         StringBuilder query = new StringBuilder(SQL_GET_ALL);
@@ -160,7 +166,7 @@ public List<Host> find(List<Filter> filters) throws DAOException {
                 hosts.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -169,7 +175,7 @@ public List<Host> find(List<Filter> filters) throws DAOException {
     }
 
     @Override
-    public boolean exist(String hostid) throws DAOException {
+    public boolean exist(String hostid) throws DAOConnectionException {
         PreparedStatement stm = null;
         ResultSet res = null;
         try {
@@ -178,7 +184,7 @@ public boolean exist(String hostid) throws DAOException {
             res = executeQuery(stm);
             return res.next();
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -186,7 +192,8 @@ public boolean exist(String hostid) throws DAOException {
     }
 
     @Override
-    public Host select(String hostid) throws DAOException {
+    public Host select(String hostid)
+        throws DAOConnectionException, DAONoDataException {
         PreparedStatement stm = null;
         ResultSet res = null;
         try {
@@ -195,18 +202,19 @@ public Host select(String hostid) throws DAOException {
             res = executeQuery(stm);
             if (res.next()) {
                 return getFromResultSet(res);
+            } else {
+                throw new DAONoDataException(("No " + getClass().getName() + " found"));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
         }
-        return null;
     }
 
     @Override
-    public void insert(Host host) throws DAOException {
+    public void insert(Host host) throws DAOConnectionException {
         Object[] params = {
             host.getHostid(),
             host.getAddress(),
@@ -226,14 +234,15 @@ public void insert(Host host) throws DAOException {
             setParameters(stm, params);
             executeUpdate(stm);
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public void update(Host host) throws DAOException {
+    public void update(Host host)
+        throws DAOConnectionException, DAONoDataException {
         Object[] params = {
             host.getHostid(),
             host.getAddress(),
@@ -252,9 +261,13 @@ public void update(Host host) throws DAOException {
         try {
             stm = connection.prepareStatement(SQL_UPDATE);
             setParameters(stm, params);
-            executeUpdate(stm);
+            try {
+                executeUpdate(stm);
+            } catch (SQLException e2) {
+                throw new DAONoDataException(e2);
+            }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
diff --git a/src/main/java/org/waarp/openr66/dao/database/DBLimitDAO.java b/src/main/java/org/waarp/openr66/dao/database/DBLimitDAO.java
index 9d4e4f922..8ffd69519 100644
--- a/src/main/java/org/waarp/openr66/dao/database/DBLimitDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/database/DBLimitDAO.java
@@ -12,7 +12,8 @@
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.openr66.dao.LimitDAO;
 import org.waarp.openr66.dao.Filter;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Limit;
 import org.waarp.openr66.pojo.UpdatedInfo;
 
@@ -76,34 +77,39 @@ public void close() {
     }
 
     @Override
-    public void delete(Limit limit) throws DAOException {
+    public void delete(Limit limit)
+        throws DAOConnectionException, DAONoDataException {
         PreparedStatement stm = null;
         try {
             stm = connection.prepareStatement(SQL_DELETE);
             setParameters(stm, limit.getHostid());
-            executeUpdate(stm);
+            try {
+                executeUpdate(stm);
+            } catch (SQLException e2) {
+                throw new DAONoDataException(e2);
+            }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public void deleteAll() throws DAOException {
+    public void deleteAll() throws DAOConnectionException {
         PreparedStatement stm = null;
         try {
             stm = connection.prepareStatement(SQL_DELETE_ALL);
             executeUpdate(stm);
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public List<Limit> getAll() throws DAOException {
+    public List<Limit> getAll() throws DAOConnectionException {
         ArrayList<Limit> limits = new ArrayList<Limit>();
         ResultSet res = null;
         PreparedStatement stm = null;
@@ -114,7 +120,7 @@ public List<Limit> getAll() throws DAOException {
                 limits.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
             closeResultSet(res);
@@ -123,7 +129,8 @@ public List<Limit> getAll() throws DAOException {
     }
 
     @Override
-    public List<Limit> find(List<Filter> filters) throws DAOException {
+    public List<Limit> find(List<Filter> filters) throws
+                                                  DAOConnectionException {
         ArrayList<Limit> limits = new ArrayList<Limit>();
         // Create the SQL query
         StringBuilder query = new StringBuilder(SQL_GET_ALL);
@@ -153,7 +160,7 @@ public List<Limit> find(List<Filter> filters) throws DAOException {
                 limits.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
             closeResultSet(res);
@@ -162,7 +169,7 @@ public List<Limit> find(List<Filter> filters) throws DAOException {
     }
 
     @Override
-    public boolean exist(String hostid) throws DAOException {
+    public boolean exist(String hostid) throws DAOConnectionException {
         PreparedStatement stm = null;
         ResultSet res = null;
         try {
@@ -171,7 +178,7 @@ public boolean exist(String hostid) throws DAOException {
             res = executeQuery(stm);
             return res.next();
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
             closeResultSet(res);
@@ -179,7 +186,8 @@ public boolean exist(String hostid) throws DAOException {
     }
 
     @Override
-    public Limit select(String hostid) throws DAOException {
+    public Limit select(String hostid)
+        throws DAOConnectionException, DAONoDataException {
         PreparedStatement stm = null;
         ResultSet res = null;
         try {
@@ -188,18 +196,19 @@ public Limit select(String hostid) throws DAOException {
             res = executeQuery(stm);
             if (res.next()) {
                 return getFromResultSet(res);
+            } else {
+                throw new DAONoDataException(("No " + getClass().getName() + " found"));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
             closeResultSet(res);
         }
-        return null;
     }
 
     @Override
-    public void insert(Limit limit) throws DAOException {
+    public void insert(Limit limit) throws DAOConnectionException {
         Object[] params = {
             limit.getHostid(),
             limit.getReadGlobalLimit(),
@@ -216,14 +225,15 @@ public void insert(Limit limit) throws DAOException {
             setParameters(stm, params);
             executeUpdate(stm);
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public void update(Limit limit) throws DAOException {
+    public void update(Limit limit)
+        throws DAOConnectionException, DAONoDataException {
         Object[] params = {
             limit.getHostid(),
             limit.getReadGlobalLimit(),
@@ -239,9 +249,13 @@ public void update(Limit limit) throws DAOException {
         try {
             stm = connection.prepareStatement(SQL_UPDATE);
             setParameters(stm, params);
-            executeUpdate(stm);
+            try {
+                executeUpdate(stm);
+            } catch (SQLException e2) {
+                throw new DAONoDataException(e2);
+            }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
diff --git a/src/main/java/org/waarp/openr66/dao/database/DBMultipleMonitorDAO.java b/src/main/java/org/waarp/openr66/dao/database/DBMultipleMonitorDAO.java
index 3aff4b635..17aa71207 100644
--- a/src/main/java/org/waarp/openr66/dao/database/DBMultipleMonitorDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/database/DBMultipleMonitorDAO.java
@@ -12,7 +12,8 @@
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.openr66.dao.MultipleMonitorDAO;
 import org.waarp.openr66.dao.Filter;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.MultipleMonitor;
 
 /**
@@ -66,34 +67,40 @@ public void close() {
     }
 
     @Override
-    public void delete(MultipleMonitor multipleMonitor) throws DAOException {
+    public void delete(MultipleMonitor multipleMonitor) throws
+                                                        DAOConnectionException,
+                                                        DAONoDataException {
         PreparedStatement stm = null;
         try {
             stm = connection.prepareStatement(SQL_DELETE);
             setParameters(stm, multipleMonitor.getHostid());
-            executeUpdate(stm);
+            try {
+                executeUpdate(stm);
+            } catch (SQLException e2) {
+                throw new DAONoDataException(e2);
+            }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public void deleteAll() throws DAOException {
+    public void deleteAll() throws DAOConnectionException {
         PreparedStatement stm = null;
         try {
             stm = connection.prepareStatement(SQL_DELETE_ALL);
             executeUpdate(stm);
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public List<MultipleMonitor> getAll() throws DAOException {
+    public List<MultipleMonitor> getAll() throws DAOConnectionException {
         ArrayList<MultipleMonitor> monitors = new ArrayList<MultipleMonitor>();
         PreparedStatement stm = null;
         ResultSet res = null;
@@ -104,7 +111,7 @@ public List<MultipleMonitor> getAll() throws DAOException {
                 monitors.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -114,7 +121,7 @@ public List<MultipleMonitor> getAll() throws DAOException {
 
     @Override
     public List<MultipleMonitor> find(List<Filter> filters)
-            throws DAOException {
+        throws DAOConnectionException {
         ArrayList<MultipleMonitor> monitors = new ArrayList<MultipleMonitor>();
         // Create the SQL query
         StringBuilder query = new StringBuilder(SQL_GET_ALL);
@@ -144,7 +151,7 @@ public List<MultipleMonitor> find(List<Filter> filters)
                 monitors.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -153,7 +160,7 @@ public List<MultipleMonitor> find(List<Filter> filters)
     }
 
     @Override
-    public boolean exist(String hostid) throws DAOException {
+    public boolean exist(String hostid) throws DAOConnectionException {
         PreparedStatement stm = null;
         ResultSet res = null;
         try {
@@ -162,7 +169,7 @@ public boolean exist(String hostid) throws DAOException {
             res = executeQuery(stm);
             return res.next();
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -170,7 +177,8 @@ public boolean exist(String hostid) throws DAOException {
     }
 
     @Override
-    public MultipleMonitor select(String hostid) throws DAOException {
+    public MultipleMonitor select(String hostid)
+        throws DAOConnectionException, DAONoDataException {
         PreparedStatement stm = null;
         ResultSet res = null;
         try {
@@ -179,18 +187,20 @@ public MultipleMonitor select(String hostid) throws DAOException {
             res = executeQuery(stm);
             if (res.next()) {
                 return getFromResultSet(res);
+            } else {
+                throw new DAONoDataException(("No " + getClass().getName() + " found"));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
         }
-        return null;
     }
 
     @Override
-    public void insert(MultipleMonitor multipleMonitor) throws DAOException {
+    public void insert(MultipleMonitor multipleMonitor) throws
+                                                        DAOConnectionException {
         Object[] params = {
             multipleMonitor.getHostid(),
             multipleMonitor.getCountConfig(),
@@ -204,14 +214,16 @@ public void insert(MultipleMonitor multipleMonitor) throws DAOException {
             setParameters(stm, params);
             executeUpdate(stm);
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public void update(MultipleMonitor multipleMonitor) throws DAOException {
+    public void update(MultipleMonitor multipleMonitor) throws
+                                                        DAOConnectionException,
+                                                        DAONoDataException {
         Object[] params = {
             multipleMonitor.getHostid(),
             multipleMonitor.getCountConfig(),
@@ -224,9 +236,13 @@ public void update(MultipleMonitor multipleMonitor) throws DAOException {
         try {
             stm = connection.prepareStatement(SQL_UPDATE);
             setParameters(stm, params);
-            executeUpdate(stm);
+            try {
+                executeUpdate(stm);
+            } catch (SQLException e2) {
+                throw new DAONoDataException(e2);
+            }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
diff --git a/src/main/java/org/waarp/openr66/dao/database/DBRuleDAO.java b/src/main/java/org/waarp/openr66/dao/database/DBRuleDAO.java
index 8f2cb3dd7..aac93621a 100644
--- a/src/main/java/org/waarp/openr66/dao/database/DBRuleDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/database/DBRuleDAO.java
@@ -17,13 +17,14 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.UpdatedInfo;
 
 import org.waarp.common.logging.WaarpLogger;
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.openr66.dao.RuleDAO;
 import org.waarp.openr66.dao.Filter;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 import org.waarp.openr66.pojo.Rule;
 import org.waarp.openr66.pojo.RuleTask;
 
@@ -107,34 +108,39 @@ public void close() {
     }
 
     @Override
-    public void delete(Rule rule) throws DAOException {
+    public void delete(Rule rule)
+        throws DAOConnectionException, DAONoDataException {
         PreparedStatement stm = null;
         try {
             stm = connection.prepareStatement(SQL_DELETE);
             setParameters(stm, rule.getName());
-            executeUpdate(stm);
+            try {
+                executeUpdate(stm);
+            } catch (SQLException e2) {
+                throw new DAONoDataException(e2);
+            }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public void deleteAll() throws DAOException {
+    public void deleteAll() throws DAOConnectionException {
         PreparedStatement stm = null;
         try {
             stm = connection.prepareStatement(SQL_DELETE_ALL);
             executeUpdate(stm);
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public List<Rule> getAll() throws DAOException {
+    public List<Rule> getAll() throws DAOConnectionException {
         ArrayList<Rule> rules = new ArrayList<Rule>();
         PreparedStatement stm = null;
         ResultSet res = null;
@@ -145,7 +151,7 @@ public List<Rule> getAll() throws DAOException {
                 rules.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -154,7 +160,7 @@ public List<Rule> getAll() throws DAOException {
     }
 
     @Override
-    public List<Rule> find(List<Filter> filters) throws DAOException {
+    public List<Rule> find(List<Filter> filters) throws DAOConnectionException {
         ArrayList<Rule> rules = new ArrayList<Rule>();
         // Create the SQL query
         StringBuilder query = new StringBuilder(SQL_GET_ALL);
@@ -184,7 +190,7 @@ public List<Rule> find(List<Filter> filters) throws DAOException {
                 rules.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -193,7 +199,7 @@ public List<Rule> find(List<Filter> filters) throws DAOException {
     }
 
     @Override
-    public boolean exist(String ruleName) throws DAOException {
+    public boolean exist(String ruleName) throws DAOConnectionException {
         PreparedStatement stm = null;
         ResultSet res = null;
         try {
@@ -202,7 +208,7 @@ public boolean exist(String ruleName) throws DAOException {
             res = executeQuery(stm);
             return res.next();
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -210,7 +216,8 @@ public boolean exist(String ruleName) throws DAOException {
     }
 
     @Override
-    public Rule select(String ruleName) throws DAOException {
+    public Rule select(String ruleName)
+        throws DAOConnectionException, DAONoDataException {
         PreparedStatement stm = null;
         ResultSet res = null;
         try {
@@ -219,18 +226,19 @@ public Rule select(String ruleName) throws DAOException {
             res = executeQuery(stm);
             if (res.next()) {
                 return getFromResultSet(res);
+            } else {
+                throw new DAONoDataException(("No " + getClass().getName() + " found"));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
         }
-        return null;
     }
 
     @Override
-    public void insert(Rule rule) throws DAOException {
+    public void insert(Rule rule) throws DAOConnectionException {
         Object[] params = {
             rule.getName(),
             rule.getXMLHostids(),
@@ -254,14 +262,15 @@ public void insert(Rule rule) throws DAOException {
             setParameters(stm, params);
             executeUpdate(stm);
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public void update(Rule rule) throws DAOException {
+    public void update(Rule rule)
+        throws DAOConnectionException, DAONoDataException {
         Object[] params = {
             rule.getName(),
             rule.getXMLHostids(),
@@ -284,16 +293,20 @@ public void update(Rule rule) throws DAOException {
         try {
             stm = connection.prepareStatement(SQL_UPDATE);
             setParameters(stm, params);
-            executeUpdate(stm);
+            try {
+                executeUpdate(stm);
+            } catch (SQLException e2) {
+                throw new DAONoDataException(e2);
+            }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     protected Rule getFromResultSet(ResultSet set) throws SQLException,
-              DAOException {
+                                                          DAOConnectionException {
         return new Rule(
                 set.getString(ID_FIELD),
                 set.getInt(MODE_TRANS_FIELD),
@@ -311,7 +324,8 @@ protected Rule getFromResultSet(ResultSet set) throws SQLException,
                 UpdatedInfo.valueOf(set.getInt(UPDATED_INFO_FIELD)));
     }
 
-    private List<String> retrieveHostids(String xml) throws DAOException {
+    private List<String> retrieveHostids(String xml) throws
+                                                     DAOConnectionException {
         ArrayList<String> res = new ArrayList<String>();
         if ((xml == null) || xml.equals("")) {
             return res;
@@ -322,7 +336,7 @@ private List<String> retrieveHostids(String xml) throws DAOException {
             document = DocumentBuilderFactory.newInstance().
             newDocumentBuilder().parse(stream);
         } catch (Exception e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         }
         document.getDocumentElement().normalize();
 
@@ -333,7 +347,8 @@ private List<String> retrieveHostids(String xml) throws DAOException {
         return res;
     }
 
-    private List<RuleTask> retrieveTasks(String xml) throws DAOException {
+    private List<RuleTask> retrieveTasks(String xml) throws
+                                                     DAOConnectionException {
         ArrayList<RuleTask> res = new ArrayList<RuleTask>();
         if ((xml == null) || xml.equals("")) {
             return res;
@@ -344,7 +359,7 @@ private List<RuleTask> retrieveTasks(String xml) throws DAOException {
             document = DocumentBuilderFactory.newInstance().newDocumentBuilder()
             .parse(stream);
         } catch (Exception e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         }
         document.getDocumentElement().normalize();
 
diff --git a/src/main/java/org/waarp/openr66/dao/database/DBTransferDAO.java b/src/main/java/org/waarp/openr66/dao/database/DBTransferDAO.java
index d115ed145..759f5d9e9 100644
--- a/src/main/java/org/waarp/openr66/dao/database/DBTransferDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/database/DBTransferDAO.java
@@ -4,7 +4,6 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -12,13 +11,13 @@
 import org.waarp.common.logging.WaarpLogger;
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.openr66.context.ErrorCode;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.database.DbConstant;
 import org.waarp.openr66.dao.TransferDAO;
 import org.waarp.openr66.dao.Filter;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 import org.waarp.openr66.pojo.Transfer;
 import org.waarp.openr66.pojo.UpdatedInfo;
-import org.waarp.openr66.protocol.configuration.Configuration;
 
 /**
  * Implementation of TransferDAO for a standard SQL database
@@ -159,7 +158,8 @@ public DBTransferDAO(Connection con) {
     }
 
     @Override
-    public void delete(Transfer transfer) throws DAOException {
+    public void delete(Transfer transfer)
+        throws DAOConnectionException, DAONoDataException {
         PreparedStatement stm = null;
         Object[] params = {
                 transfer.getId(),
@@ -170,29 +170,33 @@ public void delete(Transfer transfer) throws DAOException {
         try {
             stm = connection.prepareStatement(getDeleteRequest());
             setParameters(stm, params);
-            executeUpdate(stm);
+            try {
+                executeUpdate(stm);
+            } catch (SQLException e2) {
+                throw new DAONoDataException(e2);
+            }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public void deleteAll() throws DAOException {
+    public void deleteAll() throws DAOConnectionException {
         PreparedStatement stm = null;
         try {
             stm = connection.prepareStatement(getDeleteAllRequest());
             executeUpdate(stm);
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public List<Transfer> getAll() throws DAOException {
+    public List<Transfer> getAll() throws DAOConnectionException {
         ArrayList<Transfer> transfers = new ArrayList<Transfer>();
         PreparedStatement stm = null;
         ResultSet res = null;
@@ -203,7 +207,7 @@ public List<Transfer> getAll() throws DAOException {
                 transfers.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -231,7 +235,8 @@ private String prepareFindQuery(List<Filter> filters, Object[] params) {
     }
 
     @Override
-    public List<Transfer> find(List<Filter> filters) throws DAOException {
+    public List<Transfer> find(List<Filter> filters) throws
+                                                     DAOConnectionException {
         ArrayList<Transfer> transfers = new ArrayList<Transfer>();
         // Create the SQL query
         Object[] params = new Object[filters.size()];
@@ -247,7 +252,7 @@ public List<Transfer> find(List<Filter> filters) throws DAOException {
                 transfers.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -256,7 +261,8 @@ public List<Transfer> find(List<Filter> filters) throws DAOException {
     }
 
     @Override
-    public List<Transfer> find(List<Filter> filters, int limit) throws DAOException {
+    public List<Transfer> find(List<Filter> filters, int limit) throws
+                                                                DAOConnectionException {
         ArrayList<Transfer> transfers = new ArrayList<Transfer>();
         // Create the SQL query
         Object[] params = new Object[filters.size()];
@@ -277,7 +283,7 @@ public List<Transfer> find(List<Filter> filters, int limit) throws DAOException
                 transfers.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -287,7 +293,7 @@ public List<Transfer> find(List<Filter> filters, int limit) throws DAOException
 
     @Override
     public List<Transfer> find(List<Filter> filters, int limit, int offset)
-            throws DAOException {
+        throws DAOConnectionException {
         ArrayList<Transfer> transfers = new ArrayList<Transfer>();
         // Create the SQL query
         Object[] params = new Object[filters.size()];
@@ -312,7 +318,7 @@ public List<Transfer> find(List<Filter> filters, int limit, int offset)
                 transfers.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -322,7 +328,7 @@ public List<Transfer> find(List<Filter> filters, int limit, int offset)
 
     @Override
     public List<Transfer> find(List<Filter> filters, String column,
-                               boolean ascend) throws DAOException {
+                               boolean ascend) throws DAOConnectionException {
         ArrayList<Transfer> transfers = new ArrayList<Transfer>();
         // Create the SQL query
         Object[] params = new Object[filters.size()];
@@ -347,7 +353,7 @@ public List<Transfer> find(List<Filter> filters, String column,
                 transfers.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -357,7 +363,8 @@ public List<Transfer> find(List<Filter> filters, String column,
 
     @Override
     public List<Transfer> find(List<Filter> filters, String column,
-                               boolean ascend, int limit) throws DAOException {
+                               boolean ascend, int limit) throws
+                                                          DAOConnectionException {
         ArrayList<Transfer> transfers = new ArrayList<Transfer>();
         // Create the SQL query
         Object[] params = new Object[filters.size()];
@@ -385,7 +392,7 @@ public List<Transfer> find(List<Filter> filters, String column,
                 transfers.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -396,7 +403,7 @@ public List<Transfer> find(List<Filter> filters, String column,
     @Override
     public List<Transfer> find(List<Filter> filters, String column,
                                boolean ascend, int limit, int offset)
-            throws DAOException {
+        throws DAOConnectionException {
         ArrayList<Transfer> transfers = new ArrayList<Transfer>();
         // Create the SQL query
         Object[] params = new Object[filters.size()];
@@ -426,7 +433,7 @@ public List<Transfer> find(List<Filter> filters, String column,
                 transfers.add(getFromResultSet(res));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -436,7 +443,7 @@ public List<Transfer> find(List<Filter> filters, String column,
 
     @Override
     public boolean exist(long id, String requester, String requested,
-                         String owner) throws DAOException {
+                         String owner) throws DAOConnectionException {
         PreparedStatement stm = null;
         ResultSet res = null;
         Object[] params = {
@@ -451,7 +458,7 @@ public boolean exist(long id, String requester, String requested,
             res = executeQuery(stm);
             return res.next();
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
@@ -460,7 +467,8 @@ public boolean exist(long id, String requester, String requested,
 
     @Override
     public Transfer select(long id, String requester, String requested,
-                           String owner) throws DAOException {
+                           String owner)
+        throws DAOConnectionException, DAONoDataException {
         PreparedStatement stm = null;
         ResultSet res = null;
         Object[] params = {
@@ -475,20 +483,21 @@ public Transfer select(long id, String requester, String requested,
             res = executeQuery(stm);
             if (res.next()) {
                 return getFromResultSet(res);
+            } else {
+                throw new DAONoDataException(("No " + getClass().getName() + " found"));
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeResultSet(res);
             closeStatement(stm);
         }
-        return null;
     }
 
-    abstract protected long getNextId() throws DAOException;
+    abstract protected long getNextId() throws DAOConnectionException;
 
     @Override
-    public void insert(Transfer transfer) throws DAOException {
+    public void insert(Transfer transfer) throws DAOConnectionException {
         if (transfer.getId() == DbConstant.ILLEGALVALUE) {
             transfer.setId(getNextId());
         }
@@ -524,14 +533,15 @@ public void insert(Transfer transfer) throws DAOException {
             setParameters(stm, params);
             executeUpdate(stm);
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
     }
 
     @Override
-    public void update(Transfer transfer) throws DAOException {
+    public void update(Transfer transfer)
+        throws DAOConnectionException, DAONoDataException {
         Object[] params = {
                 transfer.getId(),
                 transfer.getGlobalStep().ordinal(),
@@ -565,9 +575,13 @@ public void update(Transfer transfer) throws DAOException {
         try {
             stm = connection.prepareStatement(getUpdateRequest());
             setParameters(stm, params);
-            executeUpdate(stm);
+            try {
+                executeUpdate(stm);
+            } catch (SQLException e2) {
+                throw new DAONoDataException(e2);
+            }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(stm);
         }
diff --git a/src/main/java/org/waarp/openr66/dao/database/StatementExecutor.java b/src/main/java/org/waarp/openr66/dao/database/StatementExecutor.java
index 681cc2570..67938c053 100644
--- a/src/main/java/org/waarp/openr66/dao/database/StatementExecutor.java
+++ b/src/main/java/org/waarp/openr66/dao/database/StatementExecutor.java
@@ -26,7 +26,7 @@ public void executeUpdate(PreparedStatement stm) throws SQLException {
         if (res < 1) {
             logger.warn("Update failed, no record updated.");
         } else {
-            logger.info(res + " records updated.");
+            logger.debug(res + " records updated.");
         }
     }
 
diff --git a/src/main/java/org/waarp/openr66/dao/database/h2/H2TransferDAO.java b/src/main/java/org/waarp/openr66/dao/database/h2/H2TransferDAO.java
index 32bd9cff0..b1ff75a0e 100644
--- a/src/main/java/org/waarp/openr66/dao/database/h2/H2TransferDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/database/h2/H2TransferDAO.java
@@ -6,18 +6,18 @@
 import java.sql.SQLException;
 
 import org.waarp.openr66.dao.database.DBTransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 
 public class H2TransferDAO extends DBTransferDAO {
 
   protected static String SQL_GET_ID = "SELECT NEXTVAL('RUNSEQ')";
 
-    public H2TransferDAO(Connection con) throws DAOException {
+    public H2TransferDAO(Connection con) throws DAOConnectionException {
         super(con);
     }
 
     @Override
-    protected long getNextId() throws DAOException {
+    protected long getNextId() throws DAOConnectionException {
         PreparedStatement ps = null;
         try {
             ps = connection.prepareStatement(SQL_GET_ID);
@@ -25,11 +25,11 @@ protected long getNextId() throws DAOException {
             if (rs.next()) {
                 return rs.getLong(1);
             } else {
-                throw new DAOException(
+                throw new DAOConnectionException(
                         "Error no id available, you should purge the database.");
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(ps);
         }
diff --git a/src/main/java/org/waarp/openr66/dao/database/mariadb/MariaDBTransferDAO.java b/src/main/java/org/waarp/openr66/dao/database/mariadb/MariaDBTransferDAO.java
index 2b01364a7..3460ab6a5 100644
--- a/src/main/java/org/waarp/openr66/dao/database/mariadb/MariaDBTransferDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/database/mariadb/MariaDBTransferDAO.java
@@ -1,7 +1,7 @@
 package org.waarp.openr66.dao.database.mariadb;
 
 import org.waarp.openr66.dao.database.DBTransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -15,12 +15,12 @@ public class MariaDBTransferDAO extends DBTransferDAO {
     private static String SQL_UPDATE_ID = "UPDATE Sequences SET seq = ? " +
             "WHERE name='RUNSEQ'";
 
-    public MariaDBTransferDAO(Connection con) throws DAOException {
+    public MariaDBTransferDAO(Connection con) throws DAOConnectionException {
         super(con);
     }
 
     @Override
-    protected long getNextId() throws DAOException {
+    protected long getNextId() throws DAOConnectionException {
         PreparedStatement ps = null;
         PreparedStatement ps2 = null;
         try {
@@ -34,11 +34,11 @@ protected long getNextId() throws DAOException {
                 ps2.executeUpdate();
                 return res;
             } else {
-                throw new DAOException(
+                throw new DAOConnectionException(
                         "Error no id available, you should purge the database.");
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(ps);
             closeStatement(ps2);
diff --git a/src/main/java/org/waarp/openr66/dao/database/oracle/OracleTransferDAO.java b/src/main/java/org/waarp/openr66/dao/database/oracle/OracleTransferDAO.java
index d8e49d089..e577c4c1e 100644
--- a/src/main/java/org/waarp/openr66/dao/database/oracle/OracleTransferDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/database/oracle/OracleTransferDAO.java
@@ -6,18 +6,18 @@
 import java.sql.SQLException;
 
 import org.waarp.openr66.dao.database.DBTransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 
 public class OracleTransferDAO extends DBTransferDAO {
 
     protected static String SQL_GET_ID = "SELECT runseq.nextval FROM DUAL";
 
-    public OracleTransferDAO(Connection con) throws DAOException {
+    public OracleTransferDAO(Connection con) throws DAOConnectionException {
         super(con);
     }
 
     @Override
-    protected long getNextId() throws DAOException {
+    protected long getNextId() throws DAOConnectionException {
         PreparedStatement ps = null;
         try {
             ps = connection.prepareStatement(SQL_GET_ID);
@@ -25,11 +25,11 @@ protected long getNextId() throws DAOException {
             if (rs.next()) {
                 return rs.getLong(1);
             } else {
-                throw new DAOException(
+                throw new DAOConnectionException(
                         "Error no id available, you should purge the database.");
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(ps);
         }
diff --git a/src/main/java/org/waarp/openr66/dao/database/postgres/PostgreSQLTransferDAO.java b/src/main/java/org/waarp/openr66/dao/database/postgres/PostgreSQLTransferDAO.java
index 05b7895de..a9fd834d2 100644
--- a/src/main/java/org/waarp/openr66/dao/database/postgres/PostgreSQLTransferDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/database/postgres/PostgreSQLTransferDAO.java
@@ -6,18 +6,18 @@
 import java.sql.SQLException;
 
 import org.waarp.openr66.dao.database.DBTransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 
 public class PostgreSQLTransferDAO extends DBTransferDAO {
 
     protected static String SQL_GET_ID = "SELECT NEXTVAL('runseq')";
 
-    public PostgreSQLTransferDAO(Connection con) throws DAOException {
+    public PostgreSQLTransferDAO(Connection con) throws DAOConnectionException {
         super(con);
     }
 
     @Override
-    protected long getNextId() throws DAOException {
+    protected long getNextId() throws DAOConnectionException {
         PreparedStatement ps = null;
         try {
             ps = connection.prepareStatement(SQL_GET_ID);
@@ -25,11 +25,11 @@ protected long getNextId() throws DAOException {
             if (rs.next()) {
                 return rs.getLong(1);
             } else {
-                throw new DAOException(
+                throw new DAOConnectionException(
                         "Error no id available, you should purge the database.");
             }
         } catch (SQLException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             closeStatement(ps);
         }
diff --git a/src/main/java/org/waarp/openr66/dao/exception/DAOConnectionException.java b/src/main/java/org/waarp/openr66/dao/exception/DAOConnectionException.java
new file mode 100644
index 000000000..038a1723c
--- /dev/null
+++ b/src/main/java/org/waarp/openr66/dao/exception/DAOConnectionException.java
@@ -0,0 +1,22 @@
+package org.waarp.openr66.dao.exception;
+
+import java.lang.Exception;
+import java.lang.Throwable;
+
+/**
+ * Connection DAO Exception
+ */
+public class DAOConnectionException extends DAOException {
+
+    public DAOConnectionException(String message) {
+        super(message);
+    }
+
+    public DAOConnectionException(Throwable cause) {
+        super(cause);
+    }
+
+    public DAOConnectionException(String message, Throwable cause) {
+        super(message, cause);
+    }
+} 
diff --git a/src/main/java/org/waarp/openr66/dao/exception/DAOException.java b/src/main/java/org/waarp/openr66/dao/exception/DAOException.java
index 2f4b9a811..2b9ab21f7 100644
--- a/src/main/java/org/waarp/openr66/dao/exception/DAOException.java
+++ b/src/main/java/org/waarp/openr66/dao/exception/DAOException.java
@@ -1,8 +1,8 @@
 package org.waarp.openr66.dao.exception;
 
-import java.lang.Exception;
-import java.lang.Throwable;
-
+/**
+ * Parent Exception of DAO
+ */
 public class DAOException extends Exception {
 
     public DAOException(String message) {
diff --git a/src/main/java/org/waarp/openr66/dao/exception/DAONoDataException.java b/src/main/java/org/waarp/openr66/dao/exception/DAONoDataException.java
new file mode 100644
index 000000000..ca6122ec5
--- /dev/null
+++ b/src/main/java/org/waarp/openr66/dao/exception/DAONoDataException.java
@@ -0,0 +1,19 @@
+package org.waarp.openr66.dao.exception;
+
+/**
+ * Exception when no data found in select or update
+ */
+public class DAONoDataException extends DAOException {
+
+    public DAONoDataException(String message) {
+        super(message);
+    }
+
+    public DAONoDataException(Throwable cause) {
+        super(cause);
+    }
+
+    public DAONoDataException(String message, Throwable cause) {
+        super(message, cause);
+    }
+} 
diff --git a/src/main/java/org/waarp/openr66/dao/xml/XMLBusinessDAO.java b/src/main/java/org/waarp/openr66/dao/xml/XMLBusinessDAO.java
index 9216af623..5cab3efdf 100644
--- a/src/main/java/org/waarp/openr66/dao/xml/XMLBusinessDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/xml/XMLBusinessDAO.java
@@ -1,15 +1,16 @@
 package org.waarp.openr66.dao.xml;
 
 import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.waarp.common.logging.WaarpLogger;
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.openr66.dao.BusinessDAO;
 import org.waarp.openr66.dao.Filter;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Business;
+import org.waarp.openr66.pojo.Host;
 import org.xml.sax.SAXException;
 
 import javax.xml.namespace.QName;
@@ -17,16 +18,23 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.xpath.*;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
 
 //TODO
 public class XMLBusinessDAO implements BusinessDAO {
 
     private static final WaarpLogger logger = WaarpLoggerFactory.getLogger(XMLBusinessDAO.class);
 
+    /**
+     * HashTable in case of lack of database
+     */
+    private static final ConcurrentHashMap<String, Business>
+        dbR66BusinessHashMap =
+        new ConcurrentHashMap<String, Business>();
+
     public static final String HOSTID_FIELD = "hostid";
 
     private static final String XML_SELECT = "/authent/entry[hostid=$hostid]";
@@ -34,23 +42,23 @@ public class XMLBusinessDAO implements BusinessDAO {
 
     private File file;
 
-    public XMLBusinessDAO(String filePath) throws DAOException {
+    public XMLBusinessDAO(String filePath) throws DAOConnectionException {
         this.file = new File(filePath);
     }
 
     public void close() {}
 
-    public void delete(Business business) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void delete(Business business) throws DAOConnectionException {
+        dbR66BusinessHashMap.remove(business.getHostid());
     }
 
-    public void deleteAll() throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void deleteAll() throws DAOConnectionException {
+        dbR66BusinessHashMap.clear();
     }
 
-    public List<Business> getAll() throws DAOException {
+    public List<Business> getAll() throws DAOConnectionException {
         if (!file.exists()) {
-            throw new DAOException("File doesn't exist");
+            throw new DAOConnectionException("File doesn't exist");
         }
         try {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -64,23 +72,28 @@ public List<Business> getAll() throws DAOException {
             List<Business> res = new ArrayList<Business>(listNode.getLength());
             for (int i = 0; i < listNode.getLength(); i++) {
                 Node node = listNode.item(i);
-                res.add(getFromNode(node));
+                Business business = getFromNode(node);
+                res.add(business);
+                dbR66BusinessHashMap.put(business.getHostid(), business);
             }
             return res;
         } catch (SAXException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (XPathExpressionException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (ParserConfigurationException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (IOException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         }
     }
 
-    public boolean exist(String hostid) throws DAOException {
+    public boolean exist(String hostid) throws DAOConnectionException {
+        if (dbR66BusinessHashMap.containsKey(hostid)) {
+            return true;
+        }
         if (!file.exists()) {
-            throw new DAOException("File doesn't exist");
+            throw new DAOConnectionException("File doesn't exist");
         }
         try {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -95,27 +108,33 @@ public boolean exist(String hostid) throws DAOException {
             // Query will return "" if nothing is found
             return(!"".equals(xpe.evaluate(document)));
         } catch (SAXException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (XPathExpressionException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (ParserConfigurationException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (IOException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         }
     }
 
-    public List<Business> find(List<Filter> fitlers) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public List<Business> find(List<Filter> fitlers) throws
+                                                     DAOConnectionException {
+        throw new DAOConnectionException("Operation not supported on XML DAO");
     }
 
-    public void insert(Business business) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void insert(Business business) throws DAOConnectionException {
+        dbR66BusinessHashMap.put(business.getHostid(), business);
     }
 
-    public Business select(String hostid) throws DAOException {
+    public Business select(String hostid)
+        throws DAOConnectionException, DAONoDataException {
+        Business business = dbR66BusinessHashMap.get(hostid);
+        if (business != null) {
+            return business;
+        }
         if (!file.exists()) {
-            throw new DAOException("File doesn't exist");
+            throw new DAOConnectionException("File doesn't exist");
         }
         try {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -130,22 +149,24 @@ public Business select(String hostid) throws DAOException {
             // Retrieve node and instantiate object
             Node node = (Node) xpe.evaluate(document, XPathConstants.NODE);
             if (node != null) {
-                return getFromNode(node);
+                business = getFromNode(node);
+                dbR66BusinessHashMap.put(business.getHostid(), business);
+                return business;
             }
-            return null;
+            throw new DAONoDataException("Business not found");
         } catch (SAXException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (XPathExpressionException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (ParserConfigurationException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (IOException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         }
     }
 
-    public void update(Business business) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void update(Business business) throws DAOConnectionException {
+        dbR66BusinessHashMap.put(business.getHostid(), business);
     }
 
     private Business getFromNode(Node parent) {
diff --git a/src/main/java/org/waarp/openr66/dao/xml/XMLDAOFactory.java b/src/main/java/org/waarp/openr66/dao/xml/XMLDAOFactory.java
index cbe480714..77ad26e5b 100644
--- a/src/main/java/org/waarp/openr66/dao/xml/XMLDAOFactory.java
+++ b/src/main/java/org/waarp/openr66/dao/xml/XMLDAOFactory.java
@@ -1,7 +1,7 @@
 package org.waarp.openr66.dao.xml;
 
 import org.waarp.openr66.dao.*;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 import org.waarp.openr66.protocol.configuration.Configuration;
 
 public class XMLDAOFactory extends DAOFactory {
@@ -18,32 +18,33 @@ public XMLDAOFactory() {}
 
 
     @Override
-    public BusinessDAO getBusinessDAO() throws DAOException {
+    public BusinessDAO getBusinessDAO() throws DAOConnectionException {
         return new XMLBusinessDAO(businessFile);
     }
 
     @Override
-    public HostDAO getHostDAO() throws DAOException {
+    public HostDAO getHostDAO() throws DAOConnectionException {
         return new XMLHostDAO(hostFile);
     }
 
     @Override
-    public LimitDAO getLimitDAO() throws DAOException {
-        return new XMLimitDAO(limitFile);
+    public LimitDAO getLimitDAO() throws DAOConnectionException {
+        return new XMLLimitDAO(limitFile);
     }
 
     @Override
-    public MultipleMonitorDAO getMultipleMonitorDAO() throws DAOException {
-        throw new DAOException("MultipleMonitor is not supported on XML DAO");
+    public MultipleMonitorDAO getMultipleMonitorDAO() throws
+                                                      DAOConnectionException {
+        throw new DAOConnectionException("MultipleMonitor is not supported on XML DAO");
     }
 
     @Override
-    public RuleDAO getRuleDAO() throws DAOException {
+    public RuleDAO getRuleDAO() throws DAOConnectionException {
         return new XMLRuleDAO(ruleFile);
     }
 
     @Override
-    public TransferDAO getTransferDAO() throws DAOException {
+    public TransferDAO getTransferDAO() throws DAOConnectionException {
         return new XMLTransferDAO(transferFile);
     }
 }
diff --git a/src/main/java/org/waarp/openr66/dao/xml/XMLHostDAO.java b/src/main/java/org/waarp/openr66/dao/xml/XMLHostDAO.java
index bc85b788e..879d980ab 100644
--- a/src/main/java/org/waarp/openr66/dao/xml/XMLHostDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/xml/XMLHostDAO.java
@@ -1,14 +1,15 @@
 package org.waarp.openr66.dao.xml;
 
 import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.waarp.common.logging.WaarpLogger;
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.openr66.dao.Filter;
 import org.waarp.openr66.dao.HostDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
+import org.waarp.openr66.database.data.DbHostAuth;
 import org.waarp.openr66.pojo.Host;
 import org.xml.sax.SAXException;
 
@@ -17,16 +18,23 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.xpath.*;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class XMLHostDAO implements HostDAO {
 
     private static final WaarpLogger logger = WaarpLoggerFactory.getLogger(XMLHostDAO.class);
 
+    /**
+     * HashTable in case of lack of database
+     */
+    private static final ConcurrentHashMap<String, Host>
+        dbR66HostAuthHashMap =
+        new ConcurrentHashMap<String, Host>();
+
     public static final String HOSTID_FIELD = "hostid";
     public static final String ADDRESS_FIELD = "address";
     public static final String PORT_FIELD = "port";
@@ -48,17 +56,17 @@ public XMLHostDAO(String filePath) {
 
     public void close() {}
 
-    public void delete(Host host) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void delete(Host host) throws DAOConnectionException {
+        dbR66HostAuthHashMap.remove(host.getHostid());
     }
 
-    public void deleteAll() throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void deleteAll() throws DAOConnectionException {
+        dbR66HostAuthHashMap.clear();
     }
 
-    public List<Host> getAll() throws DAOException {
+    public List<Host> getAll() throws DAOConnectionException {
         if (!file.exists()) {
-            throw new DAOException("File doesn't exist");
+            throw new DAOConnectionException("File doesn't exist");
         }
         try {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -72,23 +80,28 @@ public List<Host> getAll() throws DAOException {
             List<Host> res = new ArrayList<Host>(listNode.getLength());
             for (int i = 0; i < listNode.getLength(); i++) {
                 Node node = listNode.item(i);
-                res.add(getFromNode(node));
+                Host host = getFromNode(node);
+                res.add(host);
+                dbR66HostAuthHashMap.put(host.getHostid(), host);
             }
             return res;
         } catch (SAXException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (XPathExpressionException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (ParserConfigurationException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (IOException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         }
     }
 
-    public boolean exist(String hostid) throws DAOException {
+    public boolean exist(String hostid) throws DAOConnectionException {
+        if (dbR66HostAuthHashMap.containsKey(hostid)) {
+            return true;
+        }
         if (!file.exists()) {
-            throw new DAOException("File doesn't exist");
+            throw new DAOConnectionException("File doesn't exist");
         }
         try {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -103,27 +116,32 @@ public boolean exist(String hostid) throws DAOException {
             // Query will return "" if nothing is found
             return(!"".equals(xpe.evaluate(document)));
         } catch (SAXException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (XPathExpressionException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (ParserConfigurationException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (IOException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         }
     }
 
-    public List<Host> find(List<Filter> fitlers) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public List<Host> find(List<Filter> fitlers) throws DAOConnectionException {
+        throw new DAOConnectionException("Operation not supported on XML DAO");
     }
 
-    public void insert(Host host) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void insert(Host host) throws DAOConnectionException {
+        dbR66HostAuthHashMap.put(host.getHostid(), host);
     }
 
-    public Host select(String hostid) throws DAOException {
+    public Host select(String hostid)
+        throws DAOConnectionException, DAONoDataException {
+        Host host = dbR66HostAuthHashMap.get(hostid);
+        if (host != null) {
+            return host;
+        }
         if (!file.exists()) {
-            throw new DAOException("File " + file.getPath() + " doesn't exist");
+            throw new DAOConnectionException("File " + file.getPath() + " doesn't exist");
         }
         try {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -138,22 +156,24 @@ public Host select(String hostid) throws DAOException {
             // Retrieve node and instantiate object
             Node node = (Node) xpe.evaluate(document, XPathConstants.NODE);
             if (node != null) {
-                 return getFromNode(node);
+                host = getFromNode(node);
+                dbR66HostAuthHashMap.put(host.getHostid(), host);
+                return host;
             }
-            return null;
+            throw new DAONoDataException("Host not found");
         } catch (SAXException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (XPathExpressionException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (ParserConfigurationException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (IOException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         }
     }
 
-    public void update(Host host) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void update(Host host) throws DAOConnectionException {
+        dbR66HostAuthHashMap.put(host.getHostid(), host);
     }
 
     private Host getFromNode(Node parent) {
diff --git a/src/main/java/org/waarp/openr66/dao/xml/XMLimitDAO.java b/src/main/java/org/waarp/openr66/dao/xml/XMLLimitDAO.java
similarity index 61%
rename from src/main/java/org/waarp/openr66/dao/xml/XMLimitDAO.java
rename to src/main/java/org/waarp/openr66/dao/xml/XMLLimitDAO.java
index cd2f2f347..0074bc9c8 100644
--- a/src/main/java/org/waarp/openr66/dao/xml/XMLimitDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/xml/XMLLimitDAO.java
@@ -1,14 +1,14 @@
 package org.waarp.openr66.dao.xml;
 
 import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.waarp.common.logging.WaarpLogger;
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.openr66.dao.Filter;
 import org.waarp.openr66.dao.LimitDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Limit;
 import org.xml.sax.SAXException;
 
@@ -17,15 +17,22 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.xpath.*;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
 
 //TODO
-public class XMLimitDAO implements LimitDAO {
+public class XMLLimitDAO implements LimitDAO {
 
-    private static final WaarpLogger logger = WaarpLoggerFactory.getLogger(XMLimitDAO.class);
+    private static final WaarpLogger logger = WaarpLoggerFactory.getLogger(
+        XMLLimitDAO.class);
+
+    /**
+     * HashTable in case of lack of database
+     */
+    private static final ConcurrentHashMap<String, Limit> dbR66ConfigurationHashMap =
+        new ConcurrentHashMap<String, Limit>();
 
     public static final String HOSTID_FIELD = "hostid";
     public static final String SESSION_LIMIT_FILED = "sessionlimit";
@@ -39,44 +46,49 @@ public class XMLimitDAO implements LimitDAO {
 
     private File file;
 
-    public XMLimitDAO(String filePath) throws DAOException {
+    public XMLLimitDAO(String filePath) throws DAOConnectionException {
         this.file = new File(filePath);
     }
 
     public void close() {}
 
-    public void delete(Limit limit) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void delete(Limit limit) throws DAOConnectionException {
+        dbR66ConfigurationHashMap.remove(limit.getHostid());
     }
 
-    public void deleteAll() throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void deleteAll() throws DAOConnectionException {
+        dbR66ConfigurationHashMap.clear();
     }
 
-    public List<Limit> getAll() throws DAOException {
+    public List<Limit> getAll() throws DAOConnectionException {
         if (!file.exists()) {
-            throw new DAOException("File doesn't exist");
+            throw new DAOConnectionException("File doesn't exist");
         }
         try {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
             Document document = dbf.newDocumentBuilder().parse(file);
             // File contains only 1 entry
             List<Limit> res = new ArrayList<Limit>(1);
-            res.add(getFromNode(document.getDocumentElement()));
+            Limit limit = getFromNode(document.getDocumentElement());
+            res.add(limit);
+            dbR66ConfigurationHashMap.put(limit.getHostid(), limit);
             // Iterate through all found nodes
             return res;
         } catch (SAXException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (ParserConfigurationException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (IOException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         }
     }
 
-    public boolean exist(String hostid) throws DAOException {
+    public boolean exist(String hostid) throws DAOConnectionException {
+        if (dbR66ConfigurationHashMap.containsKey(hostid)) {
+            return true;
+        }
         if (!file.exists()) {
-            throw new DAOException("File doesn't exist");
+            throw new DAOConnectionException("File doesn't exist");
         }
         try {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -91,27 +103,33 @@ public boolean exist(String hostid) throws DAOException {
             // Query will return "" if nothing is found
             return(!"".equals(xpe.evaluate(document)));
         } catch (SAXException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (XPathExpressionException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (ParserConfigurationException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (IOException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         }
     }
 
-    public List<Limit> find(List<Filter> fitlers) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public List<Limit> find(List<Filter> fitlers) throws
+                                                  DAOConnectionException {
+        throw new DAOConnectionException("Operation not supported on XML DAO");
     }
 
-    public void insert(Limit limit) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void insert(Limit limit) throws DAOConnectionException {
+        dbR66ConfigurationHashMap.put(limit.getHostid(), limit);
     }
 
-    public Limit select(String hostid) throws DAOException {
+    public Limit select(String hostid)
+        throws DAOConnectionException, DAONoDataException {
+        Limit limit = dbR66ConfigurationHashMap.get(hostid);
+        if (limit != null) {
+            return limit;
+        }
         if (!file.exists()) {
-            throw new DAOException("File doesn't exist");
+            throw new DAOConnectionException("File doesn't exist");
         }
         try {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -126,22 +144,24 @@ public Limit select(String hostid) throws DAOException {
             // Retrieve node and instantiate object
             Node node = (Node) xpe.evaluate(document, XPathConstants.NODE);
             if (node != null) {
-                return getFromNode(document.getDocumentElement());
+                limit = getFromNode(document.getDocumentElement());
+                dbR66ConfigurationHashMap.put(limit.getHostid(), limit);
+                return limit;
             }
-            return null;
+            throw new DAONoDataException("Limit not found");
         } catch (SAXException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (XPathExpressionException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (ParserConfigurationException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (IOException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         }
     }
 
-    public void update(Limit limit) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void update(Limit limit) throws DAOConnectionException {
+        dbR66ConfigurationHashMap.put(limit.getHostid(), limit);
     }
 
     private Limit getFromNode(Node parent) {
diff --git a/src/main/java/org/waarp/openr66/dao/xml/XMLRuleDAO.java b/src/main/java/org/waarp/openr66/dao/xml/XMLRuleDAO.java
index 97e2d5b89..6f486c096 100644
--- a/src/main/java/org/waarp/openr66/dao/xml/XMLRuleDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/xml/XMLRuleDAO.java
@@ -7,15 +7,15 @@
 import org.waarp.common.logging.WaarpLogger;
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.openr66.configuration.ExtensionFilter;
-import org.waarp.openr66.dao.DAOFactory;
 import org.waarp.openr66.dao.Filter;
 import org.waarp.openr66.dao.RuleDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
+import org.waarp.openr66.database.data.DbRule;
 import org.waarp.openr66.pojo.Rule;
 import org.waarp.openr66.pojo.RuleTask;
 import org.waarp.openr66.protocol.configuration.Configuration;
 import org.xml.sax.SAXException;
-import sun.security.krb5.Config;
 
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -25,11 +25,18 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class XMLRuleDAO implements RuleDAO {
 
     private static final WaarpLogger logger = WaarpLoggerFactory.getLogger(XMLRuleDAO.class);
 
+    /**
+     * HashTable in case of lack of database
+     */
+    private static final ConcurrentHashMap<String, Rule> dbR66RuleHashMap =
+        new ConcurrentHashMap<String, Rule>();
+
     public static final String ROOT_LIST = "rules";
     public static final String ROOT_ELEMENT = "rule";
 
@@ -74,15 +81,15 @@ private File[] getRuleFiles() {
         return res.toArray(new File[0]);
     }
 
-    public void delete(Rule rule) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void delete(Rule rule) throws DAOConnectionException {
+        dbR66RuleHashMap.remove(rule.getName());
     }
 
-    public void deleteAll() throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void deleteAll() throws DAOConnectionException {
+        dbR66RuleHashMap.clear();
     }
 
-    public List<Rule> getAll() throws DAOException {
+    public List<Rule> getAll() throws DAOConnectionException {
         List<Rule> res = new ArrayList<Rule>();
 
         File[] files = getRuleFiles();
@@ -99,96 +106,48 @@ public List<Rule> getAll() throws DAOException {
 
                 for (int i = 0; i < listNode.getLength(); i++) {
                     Node node = listNode.item(i);
-                    res.add(getFromNode(node));
+                    Rule rule = getFromNode(node);
+                    res.add(rule);
+                    dbR66RuleHashMap.put(rule.getName(), rule);
                 }
             } catch (SAXException e) {
-                throw new DAOException(e);
+                throw new DAOConnectionException(e);
             } catch (XPathExpressionException e) {
-                throw new DAOException(e);
+                throw new DAOConnectionException(e);
             } catch (ParserConfigurationException e) {
-                throw new DAOException(e);
+                throw new DAOConnectionException(e);
             } catch (IOException e) {
-                throw new DAOException(e);
+                throw new DAOConnectionException(e);
             }
         }
         return res;
     }
 
-    public boolean exist(String rulename) throws DAOException {
-        File[] files = getRuleFiles();
-        for (File ruleFile : files) {
-            try {
-                DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-                Document document = dbf.newDocumentBuilder().parse(ruleFile);
-                // Setup XPath variable
-                SimpleVariableResolver resolver = new SimpleVariableResolver();
-                resolver.addVariable(new QName(null, "idrule"), rulename);
-                // Setup XPath query
-                XPath xPath = XPathFactory.newInstance().newXPath();
-                xPath.setXPathVariableResolver(resolver);
-                XPathExpression xpe = xPath.compile(XML_SELECT);
-                // Query will return "" if nothing is found
-                if (!"".equals(xpe.evaluate(document))) {
-                    return true;
-                }
-            } catch (SAXException e) {
-                throw new DAOException(e);
-            } catch (XPathExpressionException e) {
-                throw new DAOException(e);
-            } catch (ParserConfigurationException e) {
-                throw new DAOException(e);
-            } catch (IOException e) {
-                throw new DAOException(e);
-            }
-        }
-        return false;
+    public boolean exist(String rulename) throws DAOConnectionException {
+        return dbR66RuleHashMap.containsKey(rulename);
     }
 
-    public List<Rule> find(List<Filter> fitlers) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public List<Rule> find(List<Filter> fitlers) throws DAOConnectionException {
+        throw new DAOConnectionException("Operation not supported on XML DAO");
     }
 
-    public void insert(Rule rule) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void insert(Rule rule) throws DAOConnectionException {
+        dbR66RuleHashMap.put(rule.getName(), rule);
     }
 
-    public Rule select(String rulename) throws DAOException {
-        File[] files = getRuleFiles();
-        for (File ruleFile : files) {
-            try {
-                DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-                Document document = dbf.newDocumentBuilder().parse(ruleFile);
-                // Setup XPath variable
-                SimpleVariableResolver resolver = new SimpleVariableResolver();
-                resolver.addVariable(new QName(null, "idrule"), rulename);
-                // Setup XPath query
-                XPath xPath = XPathFactory.newInstance().newXPath();
-                xPath.setXPathVariableResolver(resolver);
-                XPathExpression xpe = xPath.compile(XML_SELECT);
-                // Retrieve node and instantiate object
-                Node node = (Node) xpe.evaluate(document, XPathConstants.NODE);
-                if (node != null) {
-                    return getFromNode(node);
-                }
-                return null;
-            } catch (SAXException e) {
-                throw new DAOException(e);
-            } catch (XPathExpressionException e) {
-                throw new DAOException(e);
-            } catch (ParserConfigurationException e) {
-                throw new DAOException(e);
-            } catch (IOException e) {
-                throw new DAOException(e);
-            }
+    public Rule select(String rulename)
+        throws DAOConnectionException, DAONoDataException {
+        if (exist(rulename)) {
+            return dbR66RuleHashMap.get(rulename);
         }
-        return null;
+        throw new DAONoDataException("Rule cannot be found");
     }
 
-    public void update(Rule rule) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void update(Rule rule) throws DAOConnectionException {
+        dbR66RuleHashMap.put(rule.getName(), rule);
     }
 
-    private Rule getFromNode(Node parent) throws DAOException {
+    private Rule getFromNode(Node parent) throws DAOConnectionException {
         Rule res = new Rule();
 
         NodeList children = parent.getChildNodes();
@@ -259,7 +218,8 @@ private Node getNode(Document doc, Rule rule) {
 
     public static final String HOSTID_FIELD = "hostid";
 
-    private List<String> retrieveHostids(String xml) throws DAOException {
+    private List<String> retrieveHostids(String xml) throws
+                                                     DAOConnectionException {
         ArrayList<String> res = new ArrayList<String>();
         if ((xml == null) || xml.equals("")) {
             return res;
@@ -271,11 +231,11 @@ private List<String> retrieveHostids(String xml) throws DAOException {
             document = DocumentBuilderFactory.newInstance().
                     newDocumentBuilder().parse(stream);
         } catch (IOException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (ParserConfigurationException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (SAXException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } finally {
             if (stream != null) {
                 try {
@@ -299,7 +259,8 @@ private List<String> retrieveHostids(String xml) throws DAOException {
     public static final String PATH_FIELD = "path";
     public static final String DELAY_FIELD = "delay";
 
-    private List<RuleTask> retrieveTasks(Node src) throws DAOException {
+    private List<RuleTask> retrieveTasks(Node src) throws
+                                                   DAOConnectionException {
         List<RuleTask> res = new ArrayList<RuleTask>();
         NodeList feed = src.getChildNodes();
         for (int i = 0; i < feed.getLength(); i++) {
diff --git a/src/main/java/org/waarp/openr66/dao/xml/XMLTransferDAO.java b/src/main/java/org/waarp/openr66/dao/xml/XMLTransferDAO.java
index af695a58d..5adf59a44 100644
--- a/src/main/java/org/waarp/openr66/dao/xml/XMLTransferDAO.java
+++ b/src/main/java/org/waarp/openr66/dao/xml/XMLTransferDAO.java
@@ -6,22 +6,23 @@
 import org.w3c.dom.NodeList;
 import org.waarp.common.logging.WaarpLogger;
 import org.waarp.common.logging.WaarpLoggerFactory;
+import org.waarp.common.lru.SynchronizedLruCache;
 import org.waarp.common.utility.LongUuid;
 import org.waarp.openr66.context.ErrorCode;
 import org.waarp.openr66.dao.Filter;
 import org.waarp.openr66.dao.TransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
+import org.waarp.openr66.database.data.DbTaskRunner;
 import org.waarp.openr66.pojo.Transfer;
 import org.waarp.openr66.protocol.configuration.Configuration;
 import org.xml.sax.SAXException;
 
 import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.xpath.*;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -60,6 +61,65 @@ public class XMLTransferDAO implements TransferDAO {
             "requested='$requested' and ownerreq='ownerreq']";
     private static final String XML_GET_ALL= "runner";
 
+
+    /**
+     * HashTable in case of lack of database using LRU mode with
+     * 20 000 items maximum (< 200 MB?) for 180s
+     */
+    private static SynchronizedLruCache<Long, Transfer> dbR66TaskHashMap;
+
+    /**
+     * Create the LRU cache
+     *
+     * @param limit
+     *            limit of number of entries in the cache
+     * @param ttl
+     *            time to leave used
+     */
+    public static void createLruCache(int limit, long ttl) {
+        dbR66TaskHashMap = new SynchronizedLruCache<Long, Transfer>(limit, ttl);
+    }
+
+    public static String hashStatus() {
+        return "DbTaskRunner: [dbR66TaskHashMap: " + dbR66TaskHashMap.size() + "] ";
+    }
+
+    /**
+     * To enable clear of oldest entries in the cache
+     *
+     * @return the number of elements removed
+     */
+    public static int clearCache() {
+        return dbR66TaskHashMap.forceClearOldest();
+    }
+
+    /**
+     * To update the TTL for the cache (to 10xTIMEOUT)
+     *
+     * @param ttl
+     */
+    public static void updateLruCacheTimeout(long ttl) {
+        dbR66TaskHashMap.setNewTtl(ttl);
+    }
+
+    /**
+     * To allow to remove specifically one SpecialId from MemoryHashmap
+     *
+     * @param specialId
+     */
+    public static final void removeNoDbSpecialId(long specialId) {
+        dbR66TaskHashMap.remove(specialId);
+    }
+
+    /**
+     * To update the usage TTL of the associated object
+     *
+     * @param specialId
+     */
+    public static final void updateUsed(long specialId) {
+        dbR66TaskHashMap.updateTtl(specialId);
+    }
+
     private File file;
 
     public XMLTransferDAO(String filePath) {
@@ -78,15 +138,16 @@ private File getFile(String requester, String requested, long id) {
                 + id + XMLEXTENSION);
     }
 
-    public void delete(Transfer transfer) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void delete(Transfer transfer) throws DAOConnectionException {
+        removeNoDbSpecialId(transfer.getId());
     }
 
-    public void deleteAll() throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public void deleteAll() throws DAOConnectionException {
+        dbR66TaskHashMap.clear();
+        throw new DAOConnectionException("Operation not supported on XML DAO");
     }
 
-    public List<Transfer> getAll() throws DAOException {
+    public List<Transfer> getAll() throws DAOConnectionException {
         File arch = new File(Configuration.configuration.getArchivePath());
         File[] runnerFiles = arch.listFiles();
         List<Transfer> res = new ArrayList<Transfer>();
@@ -102,64 +163,75 @@ public List<Transfer> getAll() throws DAOException {
                 // Iterate through all found nodes
                 for (int i = 0; i < listNode.getLength(); i++) {
                     Node node = listNode.item(i);
-                    res.add(getFromNode(node));
+                    Transfer transfer = getFromNode(node);
+                    res.add(transfer);
+                    dbR66TaskHashMap.put(transfer.getId(), transfer);
                 }
             } catch (SAXException e) {
-                throw new DAOException(e);
+                throw new DAOConnectionException(e);
             } catch (XPathExpressionException e) {
-                throw new DAOException(e);
+                throw new DAOConnectionException(e);
             } catch (ParserConfigurationException e) {
-                throw new DAOException(e);
+                throw new DAOConnectionException(e);
             } catch (IOException e) {
-                throw new DAOException(e);
+                throw new DAOConnectionException(e);
             }
         }
         return res;
     }
 
     public boolean exist(long id, String requester, String requested,
-                         String owner) throws DAOException {
+                         String owner) throws DAOConnectionException {
+        if (dbR66TaskHashMap.contains(id)) {
+            return true;
+        }
         file = getFile(requester, requested, id);
         return file.exists();
     }
 
-    public List<Transfer> find(List<Filter> fitlers) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public List<Transfer> find(List<Filter> fitlers) throws
+                                                     DAOConnectionException {
+        throw new DAOConnectionException("Operation not supported on XML DAO");
     }
 
     @Override
-    public List<Transfer> find(List<Filter> filters, int limit) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public List<Transfer> find(List<Filter> filters, int limit) throws
+                                                                DAOConnectionException {
+        throw new DAOConnectionException("Operation not supported on XML DAO");
     }
 
     @Override
-    public List<Transfer> find(List<Filter> filters, int limit, int offset) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public List<Transfer> find(List<Filter> filters, int limit, int offset) throws
+                                                                            DAOConnectionException {
+        throw new DAOConnectionException("Operation not supported on XML DAO");
     }
 
     @Override
-    public List<Transfer> find(List<Filter> filters, String column, boolean ascend) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public List<Transfer> find(List<Filter> filters, String column, boolean ascend) throws
+                                                                                    DAOConnectionException {
+        throw new DAOConnectionException("Operation not supported on XML DAO");
     }
 
     @Override
-    public List<Transfer> find(List<Filter> filters, String column, boolean ascend, int limit) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public List<Transfer> find(List<Filter> filters, String column, boolean ascend, int limit) throws
+                                                                                               DAOConnectionException {
+        throw new DAOConnectionException("Operation not supported on XML DAO");
     }
 
     @Override
-    public List<Transfer> find(List<Filter> filters, String column, boolean ascend, int limit, int offset) throws DAOException {
-        throw new DAOException("Operation not supported on XML DAO");
+    public List<Transfer> find(List<Filter> filters, String column, boolean ascend, int limit, int offset) throws
+                                                                                                           DAOConnectionException {
+        throw new DAOConnectionException("Operation not supported on XML DAO");
     }
 
-    public void insert(Transfer transfer) throws DAOException {
+    public void insert(Transfer transfer) throws DAOConnectionException {
         //Set unique Id
         transfer.setId(new LongUuid().getLong());
-
+        dbR66TaskHashMap.put(transfer.getId(), transfer);
         file = getFile(transfer.getRequester(), transfer.getRequested(),
                 transfer.getId());
         if (file.exists()) {
-            throw new DAOException("File already exist");
+            throw new DAOConnectionException("File already exist");
         }
         try {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -170,15 +242,19 @@ public void insert(Transfer transfer) throws DAOException {
             // Write document in file
             XMLUtils.writeToFile(file, document);
         } catch (ParserConfigurationException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         }
     }
 
     public Transfer select(long id, String requester, String requested,
-                       String owner) throws DAOException {
+                       String owner)
+        throws DAOConnectionException, DAONoDataException {
+        if (dbR66TaskHashMap.contains(id)) {
+            return dbR66TaskHashMap.get(id);
+        }
         file = getFile(requester, requested, id);
         if (!file.exists()) {
-            return null;
+            throw new DAONoDataException("Transfer cannot be found");
         }
         try {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -198,23 +274,23 @@ public Transfer select(long id, String requester, String requested,
             if (node != null) {
                 return getFromNode(node);
             }
-            return null;
+            throw new DAONoDataException("Transfer cannot be found");
         } catch (SAXException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (XPathExpressionException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (ParserConfigurationException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (IOException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         }
     }
 
-    public void update(Transfer transfer) throws DAOException {
+    public void update(Transfer transfer) throws DAOConnectionException {
         file = getFile(transfer.getRequester(), transfer.getRequested(),
                 transfer.getId());
         if (!file.exists()) {
-            throw new DAOException("File doesn't exist");
+            throw new DAOConnectionException("File doesn't exist");
         }
         try {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -241,14 +317,15 @@ public void update(Transfer transfer) throws DAOException {
             root.appendChild(getNode(document, transfer));
             // Write document in file
             XMLUtils.writeToFile(file, document);
+            dbR66TaskHashMap.put(transfer.getId(), transfer);
         } catch (SAXException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (XPathExpressionException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (ParserConfigurationException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         } catch (IOException e) {
-            throw new DAOException(e);
+            throw new DAOConnectionException(e);
         }
     }
 
diff --git a/src/main/java/org/waarp/openr66/database/data/DbConfiguration.java b/src/main/java/org/waarp/openr66/database/data/DbConfiguration.java
index 6a5de998d..6810f0212 100644
--- a/src/main/java/org/waarp/openr66/database/data/DbConfiguration.java
+++ b/src/main/java/org/waarp/openr66/database/data/DbConfiguration.java
@@ -1,17 +1,17 @@
 /**
  * This file is part of Waarp Project.
- * 
+ *
  * Copyright 2009, Frederic Bregier, and individual contributors by the @author tags. See the
  * COPYRIGHT.txt in the distribution for a full listing of individual contributors.
- * 
+ *
  * All Waarp Project is free software: you can redistribute it and/or modify it under the terms of
  * the GNU General Public License as published by the Free Software Foundation, either version 3 of
  * the License, or (at your option) any later version.
- * 
+ *
  * Waarp is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
  * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
  * Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with Waarp . If not, see
  * <http://www.gnu.org/licenses/>.
  */
@@ -28,13 +28,15 @@
 import org.waarp.common.database.data.DbValue;
 import org.waarp.common.database.exception.WaarpDatabaseException;
 import org.waarp.common.database.exception.WaarpDatabaseNoConnectionException;
+import org.waarp.common.database.exception.WaarpDatabaseNoDataException;
 import org.waarp.common.database.exception.WaarpDatabaseSqlException;
 import org.waarp.openr66.commander.CommanderNoDb;
 import org.waarp.openr66.dao.DAOFactory;
 import org.waarp.openr66.dao.Filter;
 import org.waarp.openr66.dao.LimitDAO;
 import org.waarp.openr66.dao.database.DBLimitDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Limit;
 import org.waarp.openr66.protocol.configuration.Configuration;
 
@@ -42,9 +44,9 @@
 
 /**
  * Configuration Table object
- * 
+ *
  * @author Frederic Bregier
- * 
+ *
  */
 public class DbConfiguration extends AbstractDbData {
     public static enum Columns {
@@ -69,12 +71,6 @@ public static enum Columns {
 
     public static final String table = " CONFIGURATION ";
 
-    /**
-     * HashTable in case of lack of database
-     */
-    private static final ConcurrentHashMap<String, DbConfiguration> dbR66ConfigurationHashMap =
-            new ConcurrentHashMap<String, DbConfiguration>();
-
     private Limit limit = null;
 
     // ALL TABLE SHOULD IMPLEMENT THIS
@@ -101,21 +97,18 @@ public static enum Columns {
 
     @Override
     protected void initObject() {
-        /*
-        primaryKey = new DbValue[] { new DbValue(limit.getHostid(),
-                Columns.HOSTID.name()) };
+        primaryKey = new DbValue[] { new DbValue("", Columns.HOSTID.name()) };
         otherFields = new DbValue[] {
-                new DbValue(limit.getReadGlobalLimit(), Columns.READGLOBALLIMIT.name()),
-                new DbValue(limit.getWriteGlobalLimit(), Columns.WRITEGLOBALLIMIT.name()),
-                new DbValue(limit.getReadSessionLimit(), Columns.READSESSIONLIMIT.name()),
-                new DbValue(limit.getWriteSessionLimit(), Columns.WRITESESSIONLIMIT.name()),
-                new DbValue(limit.getDelayLimit(), Columns.DELAYLIMIT.name()),
-                new DbValue(limit.getUpdatedInfo().ordinal(), Columns.UPDATEDINFO.name()) };
+                new DbValue(0l, Columns.READGLOBALLIMIT.name()),
+                new DbValue(0l, Columns.WRITEGLOBALLIMIT.name()),
+                new DbValue(0l, Columns.READSESSIONLIMIT.name()),
+                new DbValue(0l, Columns.WRITESESSIONLIMIT.name()),
+                new DbValue(0l, Columns.DELAYLIMIT.name()),
+                new DbValue(0, Columns.UPDATEDINFO.name()) };
         allFields = new DbValue[] {
                 otherFields[0], otherFields[1], otherFields[2], otherFields[3],
                 otherFields[4], otherFields[5], primaryKey[0] };
 
-         */
     }
 
     @Override
@@ -146,7 +139,7 @@ protected void setToArray() {
         allFields[Columns.READSESSIONLIMIT.ordinal()].setValue(limit.getReadSessionLimit());
         allFields[Columns.WRITESESSIONLIMIT.ordinal()].setValue(limit.getWriteSessionLimit());
         allFields[Columns.DELAYLIMIT.ordinal()].setValue(limit.getDelayLimit());
-        allFields[Columns.UPDATEDINFO.ordinal()].setValue(limit.getUpdatedInfo());
+        allFields[Columns.UPDATEDINFO.ordinal()].setValue(limit.getUpdatedInfo().ordinal());
     }
 
     @Override
@@ -172,7 +165,6 @@ protected void setPrimaryKey() {
     }
 
     /**
-     * @param dbSession
      * @param hostid
      * @param rg
      *            Read Global Limit
@@ -189,17 +181,22 @@ public DbConfiguration(String hostid, long rg, long wg, long rs, long ws,
            long del) {
         super();
         this.limit = new Limit(hostid, rg, wg, rs, ws, del);
+        setToArray();
     }
 
     public DbConfiguration(Limit limit) {
         super();
+        if (limit == null) {
+            throw new IllegalArgumentException(
+                "Argument in constructor cannot be null");
+        }
         this.limit = limit;
+        setToArray();
     }
 
     /**
      * Constructor from Json
-     * 
-     * @param dbSession
+     *
      * @param source
      * @throws WaarpDatabaseSqlException
      */
@@ -210,6 +207,7 @@ public DbConfiguration(ObjectNode source) throws WaarpDatabaseSqlException {
         if (limit.getHostid() == null || limit.getHostid().isEmpty()) {
             throw new WaarpDatabaseSqlException("Not enough argument to create the object");
         }
+        setToArray();
     }
 
     /**
@@ -227,7 +225,6 @@ public void setFromJson(ObjectNode node, boolean ignorePrimaryKey) throws WaarpD
     }
 
     /**
-     * @param dbSession
      * @param hostid
      * @throws WaarpDatabaseException
      */
@@ -237,16 +234,16 @@ public DbConfiguration(String hostid) throws WaarpDatabaseException {
         try {
             limitAccess = DAOFactory.getInstance().getLimitDAO();
             this.limit = limitAccess.select(hostid);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            this.limit = new Limit(hostid, 0l);
         } finally {
             if (limitAccess != null) {
                 limitAccess.close();
             }
         }
-        if (this.limit == null) {
-            this.limit = new Limit(hostid, 0l);
-        }
+        setToArray();
     }
 
     @Override
@@ -255,8 +252,11 @@ public void delete() throws WaarpDatabaseException {
         try {
             limitAccess = DAOFactory.getInstance().getLimitDAO();
             limitAccess.delete(limit);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Cannot find " +
+                                                   "Configuration", e);
         } finally {
             if (limitAccess != null) {
                 limitAccess.close();
@@ -273,7 +273,7 @@ public void insert() throws WaarpDatabaseException {
         try {
             limitAccess = DAOFactory.getInstance().getLimitDAO();
             limitAccess.insert(limit);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
         } finally {
             if (limitAccess != null) {
@@ -288,7 +288,7 @@ public boolean exist() throws WaarpDatabaseException {
         try {
             limitAccess = DAOFactory.getInstance().getLimitDAO();
             return limitAccess.exist(limit.getHostid());
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
         } finally {
             if (limitAccess != null) {
@@ -303,8 +303,11 @@ public void select() throws WaarpDatabaseException {
         try {
             limitAccess = DAOFactory.getInstance().getLimitDAO();
             limit = limitAccess.select(limit.getHostid());
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Cannot find " +
+                                                   "Configuration", e);
         } finally {
             if (limitAccess != null) {
                 limitAccess.close();
@@ -321,8 +324,11 @@ public void update() throws WaarpDatabaseException {
         try {
             limitAccess = DAOFactory.getInstance().getLimitDAO();
             limitAccess.update(limit);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Cannot find " +
+                                                   "Configuration", e);
         } finally {
             if (limitAccess != null) {
                 limitAccess.close();
@@ -342,13 +348,13 @@ public static DbConfiguration getFromStatement(DbPreparedStatement preparedState
             throws WaarpDatabaseNoConnectionException, WaarpDatabaseSqlException {
         DbConfiguration dbConfiguration = new DbConfiguration();
         dbConfiguration.getValues(preparedStatement, dbConfiguration.allFields);
-        dbConfiguration.setFromArray();
+        dbConfiguration.setToArray();
         dbConfiguration.isSaved = true;
         return dbConfiguration;
     }
 
     /**
-     * 
+     *
      * @return the DbPreparedStatement for getting Updated Object
      * @throws WaarpDatabaseNoConnectionException
      * @throws WaarpDatabaseSqlException
@@ -366,7 +372,7 @@ public static DbConfiguration[] getUpdatedPrepareStament()
         try {
             limitAccess = DAOFactory.getInstance().getLimitDAO();
             limits = limitAccess.find(filters);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseNoConnectionException(e);
         } finally {
             if (limitAccess != null) {
@@ -443,7 +449,7 @@ public void updateConfiguration() {
     }
 
     /**
-     * 
+     *
      * @return True if this Configuration refers to the current host
      */
     public boolean isOwnConfiguration() {
@@ -452,7 +458,7 @@ public boolean isOwnConfiguration() {
     }
 
     /**
-     * 
+     *
      * @return the DbValue associated with this table
      */
     public static DbValue[] getAllType() {
diff --git a/src/main/java/org/waarp/openr66/database/data/DbHostAuth.java b/src/main/java/org/waarp/openr66/database/data/DbHostAuth.java
index e840e3b43..a95467b31 100644
--- a/src/main/java/org/waarp/openr66/database/data/DbHostAuth.java
+++ b/src/main/java/org/waarp/openr66/database/data/DbHostAuth.java
@@ -44,7 +44,8 @@
 import org.waarp.openr66.dao.Filter;
 import org.waarp.openr66.dao.HostDAO;
 import org.waarp.openr66.dao.database.DBHostDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Host;
 import org.waarp.openr66.protocol.configuration.Configuration;
 import org.waarp.openr66.protocol.exception.OpenR66ProtocolBusinessException;
@@ -96,12 +97,6 @@ public static enum Columns {
 
     public static final String table = " HOSTS ";
 
-    /**
-     * HashTable in case of lack of database
-     */
-    private static final ConcurrentHashMap<String, DbHostAuth> dbR66HostAuthHashMap =
-            new ConcurrentHashMap<String, DbHostAuth>();
-
     private Host host;
 
     // ALL TABLE SHOULD IMPLEMENT THIS
@@ -134,26 +129,21 @@ public static enum Columns {
 
     @Override
     protected void initObject() {
-        /*
-        primaryKey = new DbValue[] { new DbValue(host.getHostid(), Columns.HOSTID
-                .name()) };
+        primaryKey = new DbValue[] { new DbValue("", Columns.HOSTID.name()) };
         otherFields = new DbValue[] {
-                new DbValue(host.getAddress(), Columns.ADDRESS.name()),
-                new DbValue(host.getPort(), Columns.PORT.name()),
-                new DbValue(host.isSSL(), Columns.ISSSL.name()),
-                new DbValue(host.getHostkey(), Columns.HOSTKEY.name()),
-                new DbValue(host.isAdmin(), Columns.ADMINROLE.name()),
-                new DbValue(host.isClient(), Columns.ISCLIENT.name()),
-                new DbValue(host.isActive(), Columns.ISACTIVE.name()),
-                new DbValue(host.isProxified(), Columns.ISPROXIFIED.name()),
-                new DbValue(host.getUpdatedInfo().ordinal(),
-                        Columns.UPDATEDINFO.name()) };
+                new DbValue("", Columns.ADDRESS.name()),
+                new DbValue(0, Columns.PORT.name()),
+                new DbValue(false, Columns.ISSSL.name()),
+                new DbValue(new byte[0], Columns.HOSTKEY.name()),
+                new DbValue(false, Columns.ADMINROLE.name()),
+                new DbValue(false, Columns.ISCLIENT.name()),
+                new DbValue(false, Columns.ISACTIVE.name()),
+                new DbValue(false, Columns.ISPROXIFIED.name()),
+                new DbValue(0, Columns.UPDATEDINFO.name()) };
         allFields = new DbValue[] {
                 otherFields[0], otherFields[1], otherFields[2],
                 otherFields[3], otherFields[4], otherFields[5], otherFields[6], otherFields[7], otherFields[8],
                 primaryKey[0] };
-
-         */
     }
 
     @Override
@@ -186,7 +176,7 @@ protected void setToArray() {
         allFields[Columns.ISCLIENT.ordinal()].setValue(host.isClient());
         allFields[Columns.ISACTIVE.ordinal()].setValue(host.isActive());
         allFields[Columns.ISPROXIFIED.ordinal()].setValue(host.isProxified());
-        allFields[Columns.UPDATEDINFO.ordinal()].setValue(host.getUpdatedInfo());
+        allFields[Columns.UPDATEDINFO.ordinal()].setValue(host.getUpdatedInfo().ordinal());
         allFields[Columns.HOSTID.ordinal()].setValue(host.getHostid());
     }
 
@@ -248,13 +238,19 @@ public DbHostAuth(String hostid, String address, int port,
 
     private DbHostAuth(Host host) {
         super();
+        if (host == null) {
+            throw new IllegalArgumentException(
+                "Argument in constructor cannot be null");
+        }
         this.host = host;
+        setToArray();
     }
 
     public DbHostAuth(ObjectNode source) throws WaarpDatabaseSqlException {
         super();
         this.host = new Host();
         setFromJson(source, false);
+        setToArray();
     }
 
     @Override
@@ -293,16 +289,16 @@ public DbHostAuth(String hostid) throws WaarpDatabaseException {
         try {
             hostAccess = DAOFactory.getInstance().getHostDAO();
             host = hostAccess.select(hostid);
-        } catch (DAOException e) {
+            setToArray();
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Cannot find host", e);
         } finally {
             if (hostAccess != null) {
                 hostAccess.close();
             }
         }
-        if (host == null) {
-            throw new WaarpDatabaseNoDataException("Cannot find host");
-        }
     }
 
     /**
@@ -319,7 +315,7 @@ public static DbHostAuth[] deleteAll() throws WaarpDatabaseException {
             hostAccess = DAOFactory.getInstance().getHostDAO();
             hosts = hostAccess.getAll();
             hostAccess.deleteAll();
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
         } finally {
             if (hostAccess != null) {
@@ -338,8 +334,10 @@ public void delete() throws WaarpDatabaseException {
         try {
             hostAccess = DAOFactory.getInstance().getHostDAO();
             hostAccess.delete(host);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Cannot find host", e);
         } finally {
             if (hostAccess != null) {
                 hostAccess.close();
@@ -353,7 +351,7 @@ public void insert() throws WaarpDatabaseException {
         try {
             hostAccess = DAOFactory.getInstance().getHostDAO();
             hostAccess.insert(host);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
         } finally {
             if (hostAccess != null) {
@@ -368,7 +366,7 @@ public boolean exist() throws WaarpDatabaseException {
         try {
             hostAccess = DAOFactory.getInstance().getHostDAO();
             return hostAccess.exist(host.getHostid());
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
         } finally {
             if (hostAccess != null) {
@@ -383,8 +381,10 @@ public void select() throws WaarpDatabaseException {
         try {
             hostAccess = DAOFactory.getInstance().getHostDAO();
             host = hostAccess.select(host.getHostid());
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Cannot find host", e);
         } finally {
             if (hostAccess != null) {
                 hostAccess.close();
@@ -398,8 +398,10 @@ public void update() throws WaarpDatabaseException {
         try {
             hostAccess = DAOFactory.getInstance().getHostDAO();
             hostAccess.update(host);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Cannot find host", e);
         } finally {
             if (hostAccess != null) {
                 hostAccess.close();
@@ -430,7 +432,7 @@ public static DbHostAuth[] getAllHosts()
         try {
             hostAccess = DAOFactory.getInstance().getHostDAO();
             hosts = hostAccess.getAll();
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseNoConnectionException(e);
         } finally {
             if (hostAccess != null) {
@@ -470,7 +472,7 @@ public static DbHostAuth[] getUpdatedPreparedStatement()
         try {
             hostAccess = DAOFactory.getInstance().getHostDAO();
             hosts = hostAccess.find(filters);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseNoConnectionException(e);
         } finally {
             if (hostAccess != null) {
@@ -871,7 +873,7 @@ public static boolean hasProxifiedHosts() {
         try {
             hostAccess = DAOFactory.getInstance().getHostDAO();
             return hostAccess.find(filters).size() > 0;
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             logger.error("DAO Access error", e);
             return false;
         } finally {
diff --git a/src/main/java/org/waarp/openr66/database/data/DbHostConfiguration.java b/src/main/java/org/waarp/openr66/database/data/DbHostConfiguration.java
index ae40be0f7..878300ba8 100644
--- a/src/main/java/org/waarp/openr66/database/data/DbHostConfiguration.java
+++ b/src/main/java/org/waarp/openr66/database/data/DbHostConfiguration.java
@@ -1,17 +1,17 @@
 /**
  * This file is part of Waarp Project.
- * 
+ *
  * Copyright 2009, Frederic Bregier, and individual contributors by the @author tags. See the
  * COPYRIGHT.txt in the distribution for a full listing of individual contributors.
- * 
+ *
  * All Waarp Project is free software: you can redistribute it and/or modify it under the terms of
  * the GNU General Public License as published by the Free Software Foundation, either version 3 of
  * the License, or (at your option) any later version.
- * 
+ *
  * Waarp is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
  * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
  * Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with Waarp . If not, see
  * <http://www.gnu.org/licenses/>.
  */
@@ -52,7 +52,8 @@
 import org.waarp.openr66.dao.DAOFactory;
 import org.waarp.openr66.dao.Filter;
 import org.waarp.openr66.dao.database.DBBusinessDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Business;
 import org.waarp.openr66.protocol.configuration.Configuration;
 import org.waarp.openr66.protocol.configuration.Messages;
@@ -62,9 +63,9 @@
 
 /**
  * Configuration Table object
- * 
+ *
  * @author Frederic Bregier
- * 
+ *
  */
 public class DbHostConfiguration extends AbstractDbData {
     /**
@@ -92,12 +93,6 @@ public static enum Columns {
 
     public static final String table = " HOSTCONFIG ";
 
-    /**
-     * HashTable in case of lack of database
-     */
-    private static final ConcurrentHashMap<String, DbHostConfiguration> dbR66HostConfigurationHashMap =
-            new ConcurrentHashMap<String, DbHostConfiguration>();
-
     private Business business;
 
 
@@ -195,20 +190,17 @@ public static enum OtherFields {
 
     @Override
     protected void initObject() {
-        /*
         primaryKey = new DbValue[] {
-                new DbValue(business.getHostid(), Columns.HOSTID.name()) };
+                new DbValue("", Columns.HOSTID.name()) };
         otherFields = new DbValue[] {
-                new DbValue(business.getBusiness(), Columns.BUSINESS.name(), true),
-                new DbValue(business.getRoles(), Columns.ROLES.name(), true),
-                new DbValue(business.getAliases(), Columns.ALIASES.name(), true),
-                new DbValue(business.getOthers(), Columns.OTHERS.name(), true),
-                new DbValue(business.getUpdatedInfo().ordinal(), Columns.UPDATEDINFO.name()) };
+                new DbValue("", Columns.BUSINESS.name(), true),
+                new DbValue("", Columns.ROLES.name(), true),
+                new DbValue("", Columns.ALIASES.name(), true),
+                new DbValue("", Columns.OTHERS.name(), true),
+                new DbValue(0, Columns.UPDATEDINFO.name()) };
         allFields = new DbValue[] {
                 otherFields[0], otherFields[1], otherFields[2], otherFields[3],
                 otherFields[4], primaryKey[0] };
-
-         */
     }
 
     @Override
@@ -274,7 +266,7 @@ protected void setToArray() {
             } while (len != business.getOthers().length());
         }
         allFields[Columns.OTHERS.ordinal()].setValue(business.getOthers());
-        allFields[Columns.UPDATEDINFO.ordinal()].setValue(business.getUpdatedInfo());
+        allFields[Columns.UPDATEDINFO.ordinal()].setValue(business.getUpdatedInfo().ordinal());
     }
 
     @Override
@@ -299,7 +291,6 @@ protected void setPrimaryKey() {
     }
 
     /**
-     * @param dbSession
      * @param hostid
      * @param business Business configuration
      * @param roles Roles configuration
@@ -310,17 +301,22 @@ public DbHostConfiguration(String hostid, String business, String roles, String
             String others) {
         super();
         this.business = new Business(hostid, business, roles, aliases, others);
+        setToArray();
     }
 
     public DbHostConfiguration(Business business) {
         super();
+        if (business == null) {
+            throw new IllegalArgumentException(
+                "Argument in constructor cannot be null");
+        }
         this.business = business;
+        setToArray();
     }
 
     /**
      * Constructor from Json
-     * 
-     * @param dbSession
+     *
      * @param source
      * @throws WaarpDatabaseSqlException
      */
@@ -336,7 +332,6 @@ public DbHostConfiguration(ObjectNode source) throws WaarpDatabaseSqlException {
     }
 
     /**
-     * @param dbSession
      * @param hostid
      * @throws WaarpDatabaseException
      */
@@ -346,8 +341,12 @@ public DbHostConfiguration(String hostid) throws WaarpDatabaseException {
         try {
             businessAccess = DAOFactory.getInstance().getBusinessDAO();
             this.business = businessAccess.select(hostid);
-        } catch (DAOException e) {
+            setToArray();
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("DbHostConfiguration not " +
+                                                   "found", e);
         } finally {
             if (businessAccess != null) {
                 businessAccess.close();
@@ -554,7 +553,7 @@ public void setOthers(String others) {
     }
 
     /**
-     * 
+     *
      * @return the element for the content of the other part
      */
     public Element getOtherElement() {
@@ -572,7 +571,7 @@ public Element getOtherElement() {
     }
 
     /**
-     * 
+     *
      * @param element
      *            the element to set as XML string to other part
      */
@@ -586,8 +585,11 @@ public void delete() throws WaarpDatabaseException {
         try {
             businessAccess = DAOFactory.getInstance().getBusinessDAO();
             businessAccess.delete(business);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("DbHostConfiguration not " +
+                                                   "found", e);
         } finally {
             if (businessAccess != null) {
                 businessAccess.close();
@@ -601,7 +603,7 @@ public void insert() throws WaarpDatabaseException {
         try {
             businessAccess = DAOFactory.getInstance().getBusinessDAO();
             businessAccess.insert(business);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
         } finally {
             if (businessAccess != null) {
@@ -616,7 +618,7 @@ public boolean exist() throws WaarpDatabaseException {
         try {
             businessAccess = DAOFactory.getInstance().getBusinessDAO();
             return businessAccess.exist(business.getHostid());
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
         } finally {
             if (businessAccess != null) {
@@ -631,8 +633,11 @@ public void select() throws WaarpDatabaseException {
         try {
             businessAccess = DAOFactory.getInstance().getBusinessDAO();
             this.business = businessAccess.select(business.getHostid());
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("DbHostConfiguration not " +
+                                                   "found", e);
         } finally {
             if (businessAccess != null) {
                 businessAccess.close();
@@ -646,8 +651,11 @@ public void update() throws WaarpDatabaseException {
         try {
             businessAccess = DAOFactory.getInstance().getBusinessDAO();
             businessAccess.update(business);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("DbHostConfiguration not " +
+                                                   "found", e);
         } finally {
             if (businessAccess != null) {
                 businessAccess.close();
@@ -665,7 +673,7 @@ private DbHostConfiguration() {
 
     /**
      * For instance from Commander when getting updated information
-     * 
+     *
      * @param preparedStatement
      * @return the next updated Configuration
      * @throws WaarpDatabaseNoConnectionException
@@ -675,13 +683,13 @@ public static DbHostConfiguration getFromStatement(DbPreparedStatement preparedS
             throws WaarpDatabaseNoConnectionException, WaarpDatabaseSqlException {
         DbHostConfiguration dbConfiguration = new DbHostConfiguration();
         dbConfiguration.getValues(preparedStatement, dbConfiguration.allFields);
-        dbConfiguration.setFromArray();
+        dbConfiguration.setToArray();
         dbConfiguration.isSaved = true;
         return dbConfiguration;
     }
 
     /**
-     * 
+     *
      * @return the DbPreparedStatement for getting Updated Object
      * @throws WaarpDatabaseNoConnectionException
      * @throws WaarpDatabaseSqlException
@@ -699,7 +707,7 @@ public static DbHostConfiguration[] getUpdatedPrepareStament()
         try {
             businessAccess = DAOFactory.getInstance().getBusinessDAO();
             businesses = businessAccess.find(filters);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseNoConnectionException(e);
         } finally {
             if (businessAccess != null) {
@@ -716,7 +724,7 @@ public static DbHostConfiguration[] getUpdatedPrepareStament()
     }
 
     /**
-     * 
+     *
      * @param session
      * @param hostid
      * @param business
@@ -787,7 +795,7 @@ public void updateConfiguration() {
     }
 
     /**
-     * 
+     *
      * @return True if this Configuration refers to the current host
      */
     public boolean isOwnConfiguration() {
@@ -796,7 +804,7 @@ public boolean isOwnConfiguration() {
 
     /**
      * Shortcut to add all paths element from source into set
-     * 
+     *
      * @param source
      * @param path
      * @param set
@@ -847,7 +855,7 @@ private boolean updateSet(String source, String path, HashSet<String> set) {
 
     /**
      * update Business with possible purge and new or added content, and updating in memory information
-     * 
+     *
      * @param config
      * @param newbusiness
      * @param purged
@@ -892,7 +900,7 @@ public boolean updateBusiness(Configuration config, String newbusiness, boolean
 
     /**
      * Shortcut to add all paths element with key and value from source into map
-     * 
+     *
      * @param source
      * @param path
      * @param keypath
@@ -963,7 +971,7 @@ private boolean updateMap(String source, String path, String keypath, String val
 
     /**
      * update Alias with possible purge and new or added content, and updating in memory information
-     * 
+     *
      * @param config
      * @param newalias
      * @param purged
@@ -1044,7 +1052,7 @@ public boolean updateAlias(Configuration config, String newalias, boolean purged
 
     /**
      * update Roles with possible purge and new or added content, and updating in memory information
-     * 
+     *
      * @param config
      * @param newroles
      * @param purged
@@ -1136,8 +1144,7 @@ public static void updateHostConfiguration(Configuration config, DbHostConfigura
     }
 
     /**
-     * 
-     * @param dbSession
+     *
      * @param hostid
      * @return the version of the database from HostConfiguration table
      */
@@ -1177,8 +1184,7 @@ public boolean isSeeAllId(String id) {
 
     /**
      * Update the version for this HostId
-     * 
-     * @param dbSession
+     *
      * @param hostid
      * @param version
      */
@@ -1223,7 +1229,7 @@ public static void updateVersionDb(String hostid, String version) {
     }
 
     /**
-     * 
+     *
      * @return the DbValue associated with this table
      */
     public static DbValue[] getAllType() {
diff --git a/src/main/java/org/waarp/openr66/database/data/DbMultipleMonitor.java b/src/main/java/org/waarp/openr66/database/data/DbMultipleMonitor.java
index f4ecfd12f..681377fb9 100644
--- a/src/main/java/org/waarp/openr66/database/data/DbMultipleMonitor.java
+++ b/src/main/java/org/waarp/openr66/database/data/DbMultipleMonitor.java
@@ -1,17 +1,17 @@
 /**
  * This file is part of Waarp Project.
- * 
+ *
  * Copyright 2009, Frederic Bregier, and individual contributors by the @author tags. See the
  * COPYRIGHT.txt in the distribution for a full listing of individual contributors.
- * 
+ *
  * All Waarp Project is free software: you can redistribute it and/or modify it under the terms of
  * the GNU General Public License as published by the Free Software Foundation, either version 3 of
  * the License, or (at your option) any later version.
- * 
+ *
  * Waarp is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
  * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
  * Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with Waarp . If not, see
  * <http://www.gnu.org/licenses/>.
  */
@@ -26,18 +26,20 @@
 import org.waarp.common.database.data.DbValue;
 import org.waarp.common.database.exception.WaarpDatabaseException;
 import org.waarp.common.database.exception.WaarpDatabaseNoConnectionException;
+import org.waarp.common.database.exception.WaarpDatabaseNoDataException;
 import org.waarp.common.database.exception.WaarpDatabaseSqlException;
 import org.waarp.openr66.dao.DAOFactory;
 import org.waarp.openr66.dao.MultipleMonitorDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.MultipleMonitor;
 import org.waarp.openr66.protocol.configuration.Configuration;
 
 /**
  * Configuration Table object
- * 
+ *
  * @author Frederic Bregier
- * 
+ *
  */
 public class DbMultipleMonitor extends AbstractDbData {
     public static enum Columns {
@@ -56,12 +58,6 @@ public static enum Columns {
 
     public static final String table = " MULTIPLEMONITOR ";
 
-    /**
-     * HashTable in case of lack of database
-     */
-    private static final ConcurrentHashMap<String, DbMultipleMonitor> dbR66MMHashMap =
-            new ConcurrentHashMap<String, DbMultipleMonitor>();
-
     private MultipleMonitor multipleMonitor;
 
     // ALL TABLE SHOULD IMPLEMENT THIS
@@ -82,16 +78,13 @@ public static enum Columns {
 
     @Override
     protected void initObject() {
-        /*
-        primaryKey = new DbValue[] { new DbValue(multipleMonitor.getHostid(),
-                Columns.HOSTID.name()) };
+        primaryKey = new DbValue[] { new DbValue("", Columns.HOSTID.name()) };
         otherFields = new DbValue[] {
-                new DbValue(getCountConfig(), Columns.COUNTCONFIG.name()),
-                new DbValue(getCountHost(), Columns.COUNTHOST.name()),
-                new DbValue(getCountRule(), Columns.COUNTRULE.name()) };
+                new DbValue(0, Columns.COUNTCONFIG.name()),
+                new DbValue(0, Columns.COUNTHOST.name()),
+                new DbValue(0, Columns.COUNTRULE.name()) };
         allFields = new DbValue[] {
                 otherFields[0], otherFields[1], otherFields[2], primaryKey[0] };
-         */
     }
 
     @Override
@@ -141,7 +134,6 @@ protected void setPrimaryKey() {
     }
 
     /**
-     * @param dbSession
      * @param hostid
      * @param cc
      *            count for Config
@@ -156,7 +148,6 @@ public DbMultipleMonitor(String hostid, int cc, int ch, int cr) {
     }
 
     /**
-     * @param dbSession
      * @param hostid
      * @throws WaarpDatabaseException
      */
@@ -166,8 +157,12 @@ public DbMultipleMonitor(String hostid) throws WaarpDatabaseException {
         try {
             monitorAccess = DAOFactory.getInstance().getMultipleMonitorDAO();
             multipleMonitor = monitorAccess.select(hostid);
-        } catch (DAOException e) {
+            setToArray();
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Cannot find " +
+                                                   "MultipleMonitor", e);
         } finally {
             if (monitorAccess != null) {
                 monitorAccess.close();
@@ -181,8 +176,11 @@ public void delete() throws WaarpDatabaseException {
         try {
             monitorAccess = DAOFactory.getInstance().getMultipleMonitorDAO();
             monitorAccess.delete(multipleMonitor);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Cannot find " +
+                                                   "MultipleMonitor", e);
         } finally {
             if (monitorAccess != null) {
                 monitorAccess.close();
@@ -196,7 +194,7 @@ public void insert() throws WaarpDatabaseException {
         try {
             monitorAccess = DAOFactory.getInstance().getMultipleMonitorDAO();
             monitorAccess.insert(multipleMonitor);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
         } finally {
             if (monitorAccess != null) {
@@ -211,7 +209,7 @@ public boolean exist() throws WaarpDatabaseException {
         try {
             monitorAccess = DAOFactory.getInstance().getMultipleMonitorDAO();
             return monitorAccess.exist(multipleMonitor.getHostid());
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
         } finally {
             if (monitorAccess != null) {
@@ -226,8 +224,11 @@ public void select() throws WaarpDatabaseException {
         try {
             monitorAccess = DAOFactory.getInstance().getMultipleMonitorDAO();
             multipleMonitor = monitorAccess.select(multipleMonitor.getHostid());
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Cannot find " +
+                                                   "MultipleMonitor", e);
         } finally {
             if (monitorAccess != null) {
                 monitorAccess.close();
@@ -241,8 +242,11 @@ public void update() throws WaarpDatabaseException {
         try {
             monitorAccess = DAOFactory.getInstance().getMultipleMonitorDAO();
             monitorAccess.update(multipleMonitor);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Cannot find " +
+                                                   "MultipleMonitor", e);
         } finally {
             if (monitorAccess != null) {
                 monitorAccess.close();
@@ -260,7 +264,7 @@ private DbMultipleMonitor() {
 
     /**
      * For instance from Commander when getting updated information
-     * 
+     *
      * @param preparedStatement
      * @return the next updated Configuration
      * @throws WaarpDatabaseNoConnectionException
@@ -270,13 +274,13 @@ public static DbMultipleMonitor getFromStatement(DbPreparedStatement preparedSta
             throws WaarpDatabaseNoConnectionException, WaarpDatabaseSqlException {
         DbMultipleMonitor dbMm = new DbMultipleMonitor();
         dbMm.getValues(preparedStatement, dbMm.allFields);
-        dbMm.setFromArray();
+        dbMm.setToArray();
         dbMm.isSaved = true;
         return dbMm;
     }
 
     /**
-     * 
+     *
      * @return the DbPreparedStatement for getting Updated Object in "FOR UPDATE" mode
      * @throws WaarpDatabaseNoConnectionException
      * @throws WaarpDatabaseSqlException
@@ -302,7 +306,7 @@ public static DbPreparedStatement getUpdatedPrepareStament(DbSession session)
 
     /**
      * On Commander side
-     * 
+     *
      * @return True if this is the last update
      */
     public boolean checkUpdateConfig() {
@@ -319,7 +323,7 @@ public boolean checkUpdateConfig() {
 
     /**
      * On Commander side
-     * 
+     *
      * @return True if this is the last update
      */
     public boolean checkUpdateHost() {
@@ -336,7 +340,7 @@ public boolean checkUpdateHost() {
 
     /**
      * On Commander side
-     * 
+     *
      * @return True if this is the last update
      */
     public boolean checkUpdateRule() {
diff --git a/src/main/java/org/waarp/openr66/database/data/DbRule.java b/src/main/java/org/waarp/openr66/database/data/DbRule.java
index 5a0f16fbc..815311149 100644
--- a/src/main/java/org/waarp/openr66/database/data/DbRule.java
+++ b/src/main/java/org/waarp/openr66/database/data/DbRule.java
@@ -50,7 +50,8 @@
 import org.waarp.openr66.dao.Filter;
 import org.waarp.openr66.dao.RuleDAO;
 import org.waarp.openr66.dao.database.DBRuleDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.database.data.DbTaskRunner.TASKSTEP;
 import org.waarp.openr66.pojo.Rule;
 import org.waarp.openr66.pojo.RuleTask;
@@ -110,12 +111,6 @@ public static enum Columns {
 
     public static final String table = " RULES ";
 
-    /**
-     * HashTable in case of lack of database
-     */
-    private static final ConcurrentHashMap<String, DbRule> dbR66RuleHashMap =
-            new ConcurrentHashMap<String, DbRule>();
-
     /**
      * Internal context XML fields
      */
@@ -234,31 +229,28 @@ public static enum Columns {
 
     @Override
     protected void initObject() {
-        /*
-        primaryKey = new DbValue[] { new DbValue(getIdRule(),
-                Columns.IDRULE.name()) };
+        primaryKey = new DbValue[] { new DbValue("", Columns.IDRULE.name()) };
         otherFields = new DbValue[] {
                 // HOSTIDS, MODETRANS, RECVPATH, SENDPATH, ARCHIVEPATH, WORKPATH,
                 // PRETASKS, POSTTASKS, ERRORTASKS
-                new DbValue(rule.getXMLHostids(), Columns.HOSTIDS.name(), true),
-                new DbValue(rule.getMode(), Columns.MODETRANS.name()),
-                new DbValue(rule.getRecvPath(), Columns.RECVPATH.name()),
-                new DbValue(rule.getSendPath(), Columns.SENDPATH.name()),
-                new DbValue(rule.getArchivePath(), Columns.ARCHIVEPATH.name()),
-                new DbValue(rule.getWorkPath(), Columns.WORKPATH.name()),
-                new DbValue(rule.getXMLRPreTasks(), Columns.RPRETASKS.name(), true),
-                new DbValue(rule.getXMLRPostTasks(), Columns.RPOSTTASKS.name(), true),
-                new DbValue(rule.getXMLRErrorTasks(), Columns.RERRORTASKS.name(), true),
-                new DbValue(rule.getXMLSPreTasks(), Columns.SPRETASKS.name(), true),
-                new DbValue(rule.getXMLSPostTasks(), Columns.SPOSTTASKS.name(), true),
-                new DbValue(rule.getXMLSErrorTasks(), Columns.SERRORTASKS.name(), true),
-                new DbValue(rule.getUpdatedInfo().ordinal(), Columns.UPDATEDINFO.name()) };
+                new DbValue("", Columns.HOSTIDS.name(), true),
+                new DbValue(0, Columns.MODETRANS.name()),
+                new DbValue("", Columns.RECVPATH.name()),
+                new DbValue("", Columns.SENDPATH.name()),
+                new DbValue("", Columns.ARCHIVEPATH.name()),
+                new DbValue("", Columns.WORKPATH.name()),
+                new DbValue("", Columns.RPRETASKS.name(), true),
+                new DbValue("", Columns.RPOSTTASKS.name(), true),
+                new DbValue("", Columns.RERRORTASKS.name(), true),
+                new DbValue("", Columns.SPRETASKS.name(), true),
+                new DbValue("", Columns.SPOSTTASKS.name(), true),
+                new DbValue("", Columns.SERRORTASKS.name(), true),
+                new DbValue(0, Columns.UPDATEDINFO.name()) };
         allFields = new DbValue[] {
                 otherFields[0], otherFields[1], otherFields[2], otherFields[3],
                 otherFields[4], otherFields[5], otherFields[6], otherFields[7],
                 otherFields[8], otherFields[9], otherFields[10],
                 otherFields[11], otherFields[12], primaryKey[0] };
-         */
     }
 
     @Override
@@ -315,7 +307,7 @@ protected void setToArray() {
         allFields[Columns.SPRETASKS.ordinal()].setValue(rule.getXMLSPreTasks());
         allFields[Columns.SPOSTTASKS.ordinal()].setValue(rule.getXMLSPostTasks());
         allFields[Columns.SERRORTASKS.ordinal()].setValue(rule.getXMLSErrorTasks());
-        allFields[Columns.UPDATEDINFO.ordinal()].setValue(rule.getUpdatedInfo());
+        allFields[Columns.UPDATEDINFO.ordinal()].setValue(rule.getUpdatedInfo().ordinal());
         allFields[Columns.IDRULE.ordinal()].setValue(getIdRule());
     }
 
@@ -378,7 +370,6 @@ protected void setPrimaryKey() {
     }
 
     /**
-     * @param dbSession
      * @param idRule
      * @param ids
      * @param mode
@@ -406,10 +397,10 @@ public DbRule(String idRule, String ids, int mode, String recvPath,
             fromLegacyTasks(getTasksRule(spreTasks)),
             fromLegacyTasks(getTasksRule(spostTasks)),
             fromLegacyTasks(getTasksRule(serrorTasks)));
+        setToArray();
     }
 
     /**
-     * @param dbSession
      * @param idRule
      * @throws WaarpDatabaseException
      */
@@ -419,27 +410,31 @@ public DbRule(String idRule) throws WaarpDatabaseException {
         try {
             ruleAccess = DAOFactory.getInstance().getRuleDAO();
             rule = ruleAccess.select(idRule);
-        } catch (DAOException e) {
+            setToArray();
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Rule not found", e);
         } finally {
             if (ruleAccess != null) {
                 ruleAccess.close();
             }
         }
-        if (rule == null) {
-            throw new WaarpDatabaseNoDataException("Rule not found");
-        }
     }
 
     public DbRule(Rule rule) {
         super();
-        rule = rule;
+        if (rule == null) {
+            throw new IllegalArgumentException(
+                "Argument in constructor cannot be null");
+        }
+        this.rule = rule;
+        setToArray();
     }
 
     /**
      * Constructor used from XML file
      *
-     * @param dbSession
      * @param idrule
      * @param idsArrayRef
      * @param recvpath
@@ -470,12 +465,12 @@ public DbRule(String idrule, String[] idsArrayRef, int mode,
                 fromLegacyTasks(spretasksArray),
                 fromLegacyTasks(sposttasksArray),
                 fromLegacyTasks(serrortasksArray));
+        setToArray();
     }
 
     /**
      * Constructor from Json
      *
-     * @param dbSession
      * @param source
      * @throws WaarpDatabaseSqlException
      */
@@ -486,6 +481,7 @@ public DbRule(ObjectNode source) throws WaarpDatabaseSqlException {
         if (getIdRule() == null || getIdRule().isEmpty()) {
             throw new WaarpDatabaseSqlException("Not enough argument to create the object");
         }
+        setToArray();
     }
 
     @Override
@@ -496,7 +492,6 @@ public void setFromJson(ObjectNode node, boolean ignorePrimaryKey) throws WaarpD
     /**
      * Delete all entries (used when purge and reload)
      *
-     * @param dbSession
      * @return the previous existing array of DbRule
      * @throws WaarpDatabaseException
      */
@@ -507,7 +502,7 @@ public static DbRule[] deleteAll() throws WaarpDatabaseException {
             ruleAccess = DAOFactory.getInstance().getRuleDAO();
             rules = ruleAccess.getAll();
             ruleAccess.deleteAll();
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
         } finally {
             if (ruleAccess != null) {
@@ -529,8 +524,10 @@ public void delete() throws WaarpDatabaseException {
         try {
             ruleAccess = DAOFactory.getInstance().getRuleDAO();
             ruleAccess.delete(rule);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Rule not found", e);
         } finally {
             if (ruleAccess != null) {
                 ruleAccess.close();
@@ -544,7 +541,7 @@ public void insert() throws WaarpDatabaseException {
         try {
             ruleAccess = DAOFactory.getInstance().getRuleDAO();
             ruleAccess.insert(rule);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
         } finally {
             if (ruleAccess != null) {
@@ -559,7 +556,7 @@ public boolean exist() throws WaarpDatabaseException {
         try {
             ruleAccess = DAOFactory.getInstance().getRuleDAO();
             return  ruleAccess.exist(rule.getName());
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
         } finally {
             if (ruleAccess != null) {
@@ -574,8 +571,11 @@ public void select() throws WaarpDatabaseException {
         try {
             ruleAccess = DAOFactory.getInstance().getRuleDAO();
             rule = ruleAccess.select(rule.getName());
-        } catch (DAOException e) {
+            setToArray();
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Rule not found", e);
         } finally {
             if (ruleAccess != null) {
                 ruleAccess.close();
@@ -589,8 +589,11 @@ public void update() throws WaarpDatabaseException {
         try {
             ruleAccess = DAOFactory.getInstance().getRuleDAO();
             ruleAccess.update(rule);
-        } catch (DAOException e) {
+            setToArray();
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Rule not found", e);
         } finally {
             if (ruleAccess != null) {
                 ruleAccess.close();
@@ -609,8 +612,6 @@ private DbRule() {
     /**
      * Get All DbRule from database or from internal hashMap in case of no database support
      *
-     * @param dbSession
-     *            may be null
      * @return the array of DbRule
      * @throws WaarpDatabaseNoConnectionException
      * @throws WaarpDatabaseSqlException
@@ -622,7 +623,7 @@ public static DbRule[] getAllRules()
         try {
             ruleAccess = DAOFactory.getInstance().getRuleDAO();
             rules = ruleAccess.getAll();
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseNoConnectionException(e);
         } finally {
             if (ruleAccess != null) {
@@ -650,10 +651,9 @@ public static DbRule getFromStatement(DbPreparedStatement preparedStatement)
             throws WaarpDatabaseNoConnectionException, WaarpDatabaseSqlException {
         DbRule dbRule = new DbRule();
         dbRule.getValues(preparedStatement, dbRule.allFields);
-        dbRule.setFromArray();
+        dbRule.setToArray();
         dbRule.isSaved = true;
         logger.debug("Get one Rule from Db: " + dbRule.getIdRule());
-        dbR66RuleHashMap.put(dbRule.getIdRule(), dbRule);
         return dbRule;
     }
 
@@ -673,7 +673,7 @@ public static DbRule[] getUpdatedPrepareStament()
         try {
             ruleAccess = DAOFactory.getInstance().getRuleDAO();
             rules = ruleAccess.find(filters);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseNoConnectionException(e);
         } finally {
             if (ruleAccess != null) {
diff --git a/src/main/java/org/waarp/openr66/database/data/DbTaskRunner.java b/src/main/java/org/waarp/openr66/database/data/DbTaskRunner.java
index 262bfd272..74352b9aa 100644
--- a/src/main/java/org/waarp/openr66/database/data/DbTaskRunner.java
+++ b/src/main/java/org/waarp/openr66/database/data/DbTaskRunner.java
@@ -69,7 +69,9 @@
 import org.waarp.openr66.dao.Filter;
 import org.waarp.openr66.dao.TransferDAO;
 import org.waarp.openr66.dao.database.DBTransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
+import org.waarp.openr66.dao.xml.XMLTransferDAO;
 import org.waarp.openr66.database.DbConstant;
 import org.waarp.openr66.pojo.Transfer;
 import org.waarp.openr66.protocol.configuration.Configuration;
@@ -111,12 +113,6 @@ public class DbTaskRunner extends AbstractDbData {
     private static final WaarpLogger logger = WaarpLoggerFactory
             .getLogger(DbTaskRunner.class);
 
-    /**
-     * HashTable in case of lack of database using LRU mode with
-     * 20 000 items maximum (< 200 MB?) for 180s
-     */
-    private static SynchronizedLruCache<Long, DbTaskRunner> dbR66TaskHashMap;
-
     /**
      * Create the LRU cache
      *
@@ -126,11 +122,11 @@ public class DbTaskRunner extends AbstractDbData {
      *            time to leave used
      */
     public static void createLruCache(int limit, long ttl) {
-        dbR66TaskHashMap = new SynchronizedLruCache<Long, DbTaskRunner>(limit, ttl);
+        XMLTransferDAO.createLruCache(limit, ttl);
     }
 
     public static String hashStatus() {
-        return "DbTaskRunner: [dbR66TaskHashMap: " + dbR66TaskHashMap.size() + "] ";
+        return XMLTransferDAO.hashStatus();
     }
 
     /**
@@ -139,7 +135,7 @@ public static String hashStatus() {
      * @return the number of elements removed
      */
     public static int clearCache() {
-        return dbR66TaskHashMap.forceClearOldest();
+        return XMLTransferDAO.clearCache();
     }
 
     /**
@@ -148,7 +144,7 @@ public static int clearCache() {
      * @param ttl
      */
     public static void updateLruCacheTimeout(long ttl) {
-        dbR66TaskHashMap.setNewTtl(ttl);
+        XMLTransferDAO.updateLruCacheTimeout(ttl);
     }
 
     public static enum Columns {
@@ -299,34 +295,34 @@ protected void initObject() {
         // empty transfer for initObject
         transfer = new Transfer();
         primaryKey = new DbValue[] {
-                new DbValue(transfer.getOwnerRequest(), Columns.OWNERREQ.name()),
-                new DbValue(transfer.getRequester(), Columns.REQUESTER.name()),
-                new DbValue(transfer.getRequested(), Columns.REQUESTED.name()),
-                new DbValue(transfer.getId(), Columns.SPECIALID.name()) };
+                new DbValue("", Columns.OWNERREQ.name()),
+                new DbValue("", Columns.REQUESTER.name()),
+                new DbValue("", Columns.REQUESTED.name()),
+                new DbValue(0l, Columns.SPECIALID.name()) };
         otherFields = new DbValue[] {
                 // GLOBALSTEP, GLOBALLASTSTEP, STEP, RANK, STEPSTATUS, RETRIEVEMODE,
                 // FILENAME, ISMOVED, IDRULE,
                 // BLOCKSZ, ORIGINALNAME, FILEINFO, MODETRANS,
                 // STARTTRANS, STOPTRANS
                 // INFOSTATUS, UPDATEDINFO
-                new DbValue(transfer.getGlobalStep().ordinal(), Columns.GLOBALSTEP.name()),
-                new DbValue(transfer.getLastGlobalStep().ordinal(), Columns.GLOBALLASTSTEP.name()),
-                new DbValue(transfer.getStep(), Columns.STEP.name()),
-                new DbValue(transfer.getRank(), Columns.RANK.name()),
-                new DbValue(ErrorCode.Unknown.getCode(), Columns.STEPSTATUS.name()), // status.getCode()
-                new DbValue(transfer.getRetrieveMode(), Columns.RETRIEVEMODE.name()),
-                new DbValue(transfer.getFilename(), Columns.FILENAME.name()),
-                new DbValue(transfer.getIsMoved(), Columns.ISMOVED.name()),
-                new DbValue(transfer.getRule(), Columns.IDRULE.name()),
-                new DbValue(transfer.getBlockSize(), Columns.BLOCKSZ.name()),
-                new DbValue(transfer.getOriginalName(), Columns.ORIGINALNAME.name()),
-                new DbValue(transfer.getFileInfo(), Columns.FILEINFO.name(), true),
-                new DbValue(transfer.getTransferInfo(), Columns.TRANSFERINFO.name(), true),
-                new DbValue(transfer.getTransferMode(), Columns.MODETRANS.name()),
-                new DbValue(transfer.getStart(), Columns.STARTTRANS.name()),
-                new DbValue(transfer.getStop(), Columns.STOPTRANS.name()),
-                new DbValue(ErrorCode.Unknown.getCode(), Columns.INFOSTATUS.name()),// infostatus.getCode()
-                new DbValue(transfer.getUpdatedInfo().ordinal(), Columns.UPDATEDINFO.name()) };
+                new DbValue(0, Columns.GLOBALSTEP.name()),
+                new DbValue(0, Columns.GLOBALLASTSTEP.name()),
+                new DbValue(0, Columns.STEP.name()),
+                new DbValue(0, Columns.RANK.name()),
+                new DbValue("", Columns.STEPSTATUS.name()), // status.getCode()
+                new DbValue(false, Columns.RETRIEVEMODE.name()),
+                new DbValue("", Columns.FILENAME.name()),
+                new DbValue(false, Columns.ISMOVED.name()),
+                new DbValue("", Columns.IDRULE.name()),
+                new DbValue(0, Columns.BLOCKSZ.name()),
+                new DbValue("", Columns.ORIGINALNAME.name()),
+                new DbValue("", Columns.FILEINFO.name(), true),
+                new DbValue("", Columns.TRANSFERINFO.name(), true),
+                new DbValue(0, Columns.MODETRANS.name()),
+                new DbValue(new Timestamp(0l), Columns.STARTTRANS.name()),
+                new DbValue(new Timestamp(0l), Columns.STOPTRANS.name()),
+                new DbValue("", Columns.INFOSTATUS.name()),// infostatus.getCode()
+                new DbValue(0, Columns.UPDATEDINFO.name()) };
 
         allFields = new DbValue[] {
                 otherFields[0], otherFields[1], otherFields[2], otherFields[3],
@@ -359,8 +355,8 @@ protected String getUpdateAllFields() {
 
     @Override
     protected void setToArray() {
-        allFields[Columns.GLOBALSTEP.ordinal()].setValue(transfer.getGlobalStep());
-        allFields[Columns.GLOBALLASTSTEP.ordinal()].setValue(transfer.getLastGlobalStep());
+        allFields[Columns.GLOBALSTEP.ordinal()].setValue(transfer.getGlobalStep().ordinal());
+        allFields[Columns.GLOBALLASTSTEP.ordinal()].setValue(transfer.getLastGlobalStep().ordinal());
         allFields[Columns.STEP.ordinal()].setValue(transfer.getStep());
         allFields[Columns.RANK.ordinal()].setValue(transfer.getRank());
         allFields[Columns.STEPSTATUS.ordinal()].setValue(transfer.getStepStatus().getCode());
@@ -377,7 +373,7 @@ protected void setToArray() {
         transfer.setStop(new Timestamp(System.currentTimeMillis()));
         allFields[Columns.STOPTRANS.ordinal()].setValue(transfer.getStop());
         allFields[Columns.INFOSTATUS.ordinal()].setValue(transfer.getInfoStatus().getCode());
-        allFields[Columns.UPDATEDINFO.ordinal()].setValue(transfer.getUpdatedInfo());
+        allFields[Columns.UPDATEDINFO.ordinal()].setValue(transfer.getUpdatedInfo().ordinal());
         allFields[Columns.OWNERREQ.ordinal()].setValue(transfer.getOwnerRequest());
         allFields[Columns.REQUESTER.ordinal()].setValue(transfer.getRequester());
         allFields[Columns.REQUESTED.ordinal()].setValue(transfer.getRequested());
@@ -513,7 +509,12 @@ public void checkThroughMode() {
 
     public DbTaskRunner(Transfer transfer) {
         super();
+        if (transfer == null) {
+            throw new IllegalArgumentException(
+                "Argument in constructor cannot be null");
+        }
         this.transfer = transfer;
+        setToArray();
     }
 
     /**
@@ -568,6 +569,7 @@ public DbTaskRunner(DbRule rule, boolean isSender,
         checkThroughMode();
         insert();
         requestPacket.setSpecialId(transfer.getId());
+        setToArray();
     }
 
     /**
@@ -598,6 +600,7 @@ public DbTaskRunner(R66Session session, DbRule rule,
         setOriginalSizeTransferMap(originalSize);
 
         checkThroughMode();
+        setToArray();
         insert();
         requestPacket.setSpecialId(transfer.getId());
     }
@@ -622,16 +625,15 @@ public DbTaskRunner(R66Session session, DbRule rule,
             transferAccess = DAOFactory.getInstance().getTransferDAO();
             transfer = transferAccess.select(id, requester, requested,
                     Configuration.configuration.getHOST_ID());
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Transfer not found", e);
         } finally {
             if (transferAccess != null) {
                 transferAccess.close();
             }
         }
-        if (transfer == null) {
-            throw new WaarpDatabaseNoDataException("Transfer not found");
-        }
         this.rule = new DbRule(getRuleId());
         if (rule != null) {
             if (!transfer.getRule().equals(rule.getIdRule())) {
@@ -639,6 +641,7 @@ public DbTaskRunner(R66Session session, DbRule rule,
                         "Rule does not correspond");
             }
         }
+        setToArray();
     }
 
     /**
@@ -657,14 +660,17 @@ public DbTaskRunner(long id, String requester, String requested)
             transferAccess = DAOFactory.getInstance().getTransferDAO();
             transfer = transferAccess.select(id, requester, requested,
                     Configuration.configuration.getHOST_ID());
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Transfer not found", e);
         } finally {
             if (transferAccess != null) {
                 transferAccess.close();
             }
         }
         this.rule = new DbRule(getRuleId());
+        setToArray();
     }
 
     /**
@@ -683,6 +689,7 @@ public DbTaskRunner(long id, String requester, String requested, String owner)
         } else {
             transfer.setOwnerRequest(owner);
         }
+        setToArray();
     }
 
     /**
@@ -695,6 +702,7 @@ public DbTaskRunner(ObjectNode source) throws WaarpDatabaseException {
         super();
         transfer = new Transfer();
         setFromJson(source, false);
+        setToArray();
     }
 
     @Override
@@ -851,8 +859,11 @@ public DbTaskRunner(long id, String requested)
             transfer = transferAccess.select(id,
                     Configuration.configuration.getHOST_ID(), requested,
                     Configuration.configuration.getHOST_ID());
-        } catch (DAOException e) {
+            setToArray();
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Transfer not found", e);
         } finally {
             if (transferAccess != null) {
                 transferAccess.close();
@@ -874,17 +885,6 @@ private static String getLimitWhereCondition() {
     private void createNoDbSpecialId() {
         transfer.setId(new LongUuid().getLong());
         setPrimaryKey();
-        /*synchronized (clientNoDbSpecialIdLast) {
-        	// New SpecialId is not possible with No Database Model
-        	specialId = System.currentTimeMillis();
-        	if (clientNoDbSpecialIdLast.get() >= specialId) {
-        		specialId = clientNoDbSpecialIdLast.incrementAndGet();
-        	} else {
-        		clientNoDbSpecialIdLast.set(specialId);
-        	}
-        	setPrimaryKey();
-        	return;
-        }*/
     }
 
     /**
@@ -900,7 +900,7 @@ private final void removeNoDbSpecialId() {
      * @param specialId
      */
     public static final void removeNoDbSpecialId(long specialId) {
-        dbR66TaskHashMap.remove(specialId);
+        XMLTransferDAO.removeNoDbSpecialId(specialId);
     }
 
     /**
@@ -909,7 +909,7 @@ public static final void removeNoDbSpecialId(long specialId) {
      * @param specialId
      */
     public static final void updateUsed(long specialId) {
-        dbR66TaskHashMap.updateTtl(specialId);
+        XMLTransferDAO.updateUsed(specialId);
     }
 
     @Override
@@ -918,8 +918,10 @@ public void delete() throws WaarpDatabaseException {
         try {
             transferAccess = DAOFactory.getInstance().getTransferDAO();
             transferAccess.delete(transfer);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Transfer not found", e);
         } finally {
             if (transferAccess != null) {
                 transferAccess.close();
@@ -953,7 +955,7 @@ public void insert() throws WaarpDatabaseException {
         try {
             transferAccess = DAOFactory.getInstance().getTransferDAO();
             transferAccess.insert(transfer);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
         } finally {
             if (transferAccess != null) {
@@ -979,7 +981,7 @@ public boolean exist() throws WaarpDatabaseException {
             return transferAccess.exist(transfer.getId(),
                     transfer.getRequester(), transfer.getRequested(),
                     Configuration.configuration.getHOST_ID());
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
         } finally {
             if (transferAccess != null) {
@@ -1011,16 +1013,15 @@ public void select() throws WaarpDatabaseException {
             transfer = transferAccess.select(transfer.getId(),
                     transfer.getRequester(), transfer.getRequested(),
                     Configuration.configuration.getHOST_ID());
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseNoConnectionException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Transfer not found", e);
         } finally {
             if (transferAccess != null) {
                 transferAccess.close();
             }
         }
-        if (transfer == null) {
-            throw new WaarpDatabaseNoConnectionException("No Transfer found");
-        }
         this.rule = new DbRule(getRuleId());
         checkThroughMode();
     }
@@ -1067,8 +1068,10 @@ protected void optimizedUpdate() throws WaarpDatabaseException {
         try {
             transferAccess = DAOFactory.getInstance().getTransferDAO();
             transferAccess.update(transfer);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoDataException("Transfer not found", e);
         } finally {
             if (transferAccess != null) {
                 transferAccess.close();
@@ -1157,8 +1160,7 @@ public static DbTaskRunner getFromStatement(
             throws WaarpDatabaseNoConnectionException, WaarpDatabaseSqlException {
         DbTaskRunner dbTaskRunner = new DbTaskRunner();
         dbTaskRunner.getValues(preparedStatement, dbTaskRunner.allFields);
-        dbTaskRunner.setFromArray();
-        if (dbTaskRunner.rule == null) {
+        if (dbTaskRunner.rule == null && dbTaskRunner.transfer.getRule() != null) {
             try {
                 dbTaskRunner.rule = new DbRule(dbTaskRunner.getRuleId());
             } catch (WaarpDatabaseException e) {
@@ -1167,6 +1169,7 @@ public static DbTaskRunner getFromStatement(
             }
         }
         dbTaskRunner.checkThroughMode();
+        dbTaskRunner.setToArray();
         dbTaskRunner.isSaved = true;
         return dbTaskRunner;
     }
@@ -1185,6 +1188,7 @@ public static DbTaskRunner getFromStatementNoDbRule(
         DbTaskRunner dbTaskRunner = new DbTaskRunner();
         dbTaskRunner.getValues(preparedStatement, dbTaskRunner.allFields);
         dbTaskRunner.setFromArray();
+        dbTaskRunner.setToArray();
         if (dbTaskRunner.rule == null) {
             try {
                 dbTaskRunner.rule = new DbRule(dbTaskRunner.getRuleId());
@@ -1559,7 +1563,7 @@ public static DbTaskRunner[] getSelectFromInfoPrepareStatement(
             } else {
                 transfers = transferAccess.find(filters, limit);
             }
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseNoConnectionException(e);
         } finally {
             if (transferAccess != null) {
@@ -2084,8 +2088,10 @@ public static void changeFinishedToDone()
                 transfer.setUpdatedInfo(org.waarp.openr66.pojo.UpdatedInfo.DONE);
                 transferAccess.update(transfer);
             }
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new WaarpDatabaseNoConnectionException(e);
+        } catch (DAONoDataException e) {
+            throw new WaarpDatabaseNoConnectionException("Transfer not found");
         } finally {
             transferAccess.close();
         }
@@ -3875,6 +3881,7 @@ public String asXML() throws OpenR66ProtocolBusinessException {
 
     @Override
     public ObjectNode getJson() {
+        setToArray();
         ObjectNode node = super.getJson();
         if (rescheduledTransfer) {
             node.put(JSON_RESCHEDULE, true);
@@ -3955,6 +3962,7 @@ public static DbTaskRunner fromStringXml(String xml, boolean reverse) throws Ope
         setRunnerFromElementNoException(runner, document.getRootElement());
         try {
             runner.setFromArray();
+            runner.setToArray();
         } catch (WaarpDatabaseSqlException e) {
             logger.error("Cannot read XML", e);
             throw new OpenR66ProtocolBusinessException("Cannot read XML: " + e.getMessage());
@@ -4129,6 +4137,7 @@ public static void loadXml(File logsFile) throws OpenR66ProtocolBusinessExceptio
             try {
                 setRunnerFromElement(runnerlog, element);
                 runnerlog.setFromArray();
+                runnerlog.setToArray();
                 runnerlog.insertOrUpdateForLogsImport();
             } catch (WaarpDatabaseSqlException e) {
                 error = true;
diff --git a/src/main/java/org/waarp/openr66/protocol/http/HttpFormattedHandler.java b/src/main/java/org/waarp/openr66/protocol/http/HttpFormattedHandler.java
index 6de1e7cdc..bcc05a11c 100644
--- a/src/main/java/org/waarp/openr66/protocol/http/HttpFormattedHandler.java
+++ b/src/main/java/org/waarp/openr66/protocol/http/HttpFormattedHandler.java
@@ -45,9 +45,7 @@
 import io.netty.handler.traffic.TrafficCounter;
 
 import org.waarp.common.database.DbAdmin;
-import org.waarp.common.database.DbPreparedStatement;
 import org.waarp.common.database.DbSession;
-import org.waarp.common.database.exception.WaarpDatabaseException;
 import org.waarp.common.database.exception.WaarpDatabaseNoConnectionException;
 import org.waarp.common.database.exception.WaarpDatabaseSqlException;
 import org.waarp.common.exception.FileTransferException;
@@ -63,7 +61,7 @@
 import org.waarp.openr66.dao.Filter;
 import org.waarp.openr66.dao.TransferDAO;
 import org.waarp.openr66.dao.database.DBTransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 import org.waarp.openr66.database.DbConstant;
 import org.waarp.openr66.database.data.DbTaskRunner;
 import org.waarp.openr66.database.data.DbTaskRunner.TASKSTEP;
@@ -75,7 +73,6 @@
 import org.waarp.openr66.protocol.exception.OpenR66ExceptionTrappedFactory;
 import org.waarp.openr66.protocol.exception.OpenR66ProtocolBusinessNoWriteBackException;
 import org.waarp.openr66.protocol.localhandler.LocalChannelReference;
-import org.waarp.openr66.protocol.localhandler.packet.RequestPacket;
 
 /**
  * Handler for HTTP information support
@@ -520,7 +517,7 @@ private void active(ChannelHandlerContext ctx, int nb) {
             transfers = transferAccess.find(filters,
                     DBTransferDAO.TRANSFER_START_FIELD, false, nb);
             addRunners(transfers, ErrorCode.PostProcessingOk.getMesg(), nb);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             logger.warn("OpenR66 Web Error {}", e.getMessage());
             sendError(ctx, HttpResponseStatus.SERVICE_UNAVAILABLE);
             return;
@@ -582,7 +579,7 @@ private void error(ChannelHandlerContext ctx, int nb) {
             transfers = transferAccess.find(filters,
                     DBTransferDAO.TRANSFER_START_FIELD, false, nb/4);
             addRunners(transfers, TASKSTEP.ERRORTASK.name(), nb/4);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             logger.warn("OpenR66 Web Error {}", e.getMessage());
             sendError(ctx, HttpResponseStatus.SERVICE_UNAVAILABLE);
             return;
@@ -617,7 +614,7 @@ private void done(ChannelHandlerContext ctx, int nb) {
             transfers = transferAccess.find(filters,
                     DBTransferDAO.TRANSFER_START_FIELD, false, nb);
             addRunners(transfers, "ALL RUNNERS: " + nb, nb);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             logger.warn("OpenR66 Web Error {}", e.getMessage());
             sendError(ctx, HttpResponseStatus.SERVICE_UNAVAILABLE);
             return;
@@ -650,7 +647,7 @@ private void all(ChannelHandlerContext ctx, int nb) {
             transfers = transferAccess.find(filters,
                     DBTransferDAO.TRANSFER_START_FIELD, false, nb);
             addRunners(transfers, "ALL RUNNERS: " + nb, nb);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             logger.warn("OpenR66 Web Error {}", e.getMessage());
             sendError(ctx, HttpResponseStatus.SERVICE_UNAVAILABLE);
             return;
@@ -719,7 +716,7 @@ private void status(ChannelHandlerContext ctx, int nb) {
                 responseContent.append("<p>Some Transfers are in ERRORTASK</p><br>");
                 status = HttpResponseStatus.INTERNAL_SERVER_ERROR;
             }
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             logger.warn("OpenR66 Web Error {}", e.getMessage());
             sendError(ctx, HttpResponseStatus.SERVICE_UNAVAILABLE);
             return;
diff --git a/src/main/java/org/waarp/openr66/protocol/http/rest/handler/HttpRestAbstractR66Handler.java b/src/main/java/org/waarp/openr66/protocol/http/rest/handler/HttpRestAbstractR66Handler.java
index 35cfe6e15..890e47567 100644
--- a/src/main/java/org/waarp/openr66/protocol/http/rest/handler/HttpRestAbstractR66Handler.java
+++ b/src/main/java/org/waarp/openr66/protocol/http/rest/handler/HttpRestAbstractR66Handler.java
@@ -148,7 +148,7 @@ public ChannelFuture sendResponse(HttpRestHandler handler, ChannelHandlerContext
         logger.debug("Will write: {}", body);
         ChannelFuture future = ctx.writeAndFlush(response);
         if (handler.isWillClose()) {
-            System.err.println("Will close session in HttpRestAbstractR66Handler");
+            logger.debug("Will close session in HttpRestAbstractR66Handler");
             return future;
         }
         return null;
diff --git a/src/main/java/org/waarp/openr66/protocol/http/restv2/converters/HostConfigConverter.java b/src/main/java/org/waarp/openr66/protocol/http/restv2/converters/HostConfigConverter.java
index 69c1ebbd2..5af0629b6 100644
--- a/src/main/java/org/waarp/openr66/protocol/http/restv2/converters/HostConfigConverter.java
+++ b/src/main/java/org/waarp/openr66/protocol/http/restv2/converters/HostConfigConverter.java
@@ -26,7 +26,8 @@
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.waarp.openr66.dao.BusinessDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Business;
 import org.waarp.openr66.protocol.http.restv2.errors.RestError;
 import org.waarp.openr66.protocol.http.restv2.errors.RestErrorException;
@@ -198,7 +199,9 @@ public static List<ROLE> getRoles(String hostName) {
             businessDAO = DAO_FACTORY.getBusinessDAO();
             Business config = businessDAO.select(SERVER_NAME);
             array = getRolesArray(config);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
+            throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
             throw new InternalServerErrorException(e);
         } finally {
             if (businessDAO != null) {
diff --git a/src/main/java/org/waarp/openr66/protocol/http/restv2/converters/TransferConverter.java b/src/main/java/org/waarp/openr66/protocol/http/restv2/converters/TransferConverter.java
index 569ec0f44..7fb1abf76 100644
--- a/src/main/java/org/waarp/openr66/protocol/http/restv2/converters/TransferConverter.java
+++ b/src/main/java/org/waarp/openr66/protocol/http/restv2/converters/TransferConverter.java
@@ -27,7 +27,8 @@
 import org.joda.time.DateTime;
 import org.waarp.openr66.dao.HostDAO;
 import org.waarp.openr66.dao.RuleDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Rule;
 import org.waarp.openr66.pojo.Transfer;
 import org.waarp.openr66.pojo.UpdatedInfo;
@@ -156,7 +157,9 @@ public static Transfer nodeToNewTransfer(ObjectNode object) {
             ruleDAO = DAO_FACTORY.getRuleDAO();
             Rule rule = ruleDAO.select(transfer.getRule());
             mode = ModeTrans.fromCode(rule.getMode());
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
+            throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
             throw new InternalServerErrorException(e);
         } finally {
             if (ruleDAO != null) {
@@ -187,7 +190,7 @@ private static boolean ruleExists(String rule) {
         try {
             ruleDAO = DAO_FACTORY.getRuleDAO();
             return ruleDAO.exist(rule);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
         } finally {
             if (ruleDAO != null) {
@@ -207,7 +210,7 @@ private static boolean hostExists(String host) {
         try {
             hostDAO = DAO_FACTORY.getHostDAO();
             return hostDAO.exist(host);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
         } finally {
             if (hostDAO != null) {
@@ -230,7 +233,9 @@ private static boolean canUseRule(String host, String rule) {
             ruleDAO = DAO_FACTORY.getRuleDAO();
             List<String> hostIds = ruleDAO.select(rule).getHostids();
             return !hostIds.isEmpty() && !hostIds.contains(host);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
+            throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
             throw new InternalServerErrorException(e);
         } finally {
             if (ruleDAO != null) {
diff --git a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/HostConfigHandler.java b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/HostConfigHandler.java
index 084dbc36e..0d36697fc 100644
--- a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/HostConfigHandler.java
+++ b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/HostConfigHandler.java
@@ -28,7 +28,8 @@
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpRequest;
 import org.waarp.openr66.dao.BusinessDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Business;
 import org.waarp.openr66.protocol.http.restv2.converters.HostConfigConverter;
 import org.waarp.openr66.protocol.http.restv2.errors.RestErrorException;
@@ -107,8 +108,10 @@ public void getConfig(HttpRequest request, HttpResponder responder) {
             } else {
                 responder.sendStatus(NOT_FOUND);
             }
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (businessDAO != null) {
                 businessDAO.close();
@@ -143,7 +146,7 @@ public void initializeConfig(HttpRequest request, HttpResponder responder) {
             } else {
                 throw new RestErrorException(ALREADY_EXISTING(SERVER_NAME));
             }
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
         } finally {
             if (businessDAO != null) {
@@ -180,8 +183,10 @@ public void updateConfig(HttpRequest request, HttpResponder responder) {
             ObjectNode responseObject = HostConfigConverter.businessToNode(newConfig);
             String responseText = JsonUtils.nodeToString(responseObject);
             responder.sendJson(CREATED, responseText);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (businessDAO != null) {
                 businessDAO.close();
@@ -209,8 +214,10 @@ public void deleteConfig(HttpRequest request, HttpResponder responder) {
             } else {
                 responder.sendStatus(NOT_FOUND);
             }
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (businessDAO != null) {
                 businessDAO.close();
diff --git a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/HostIdHandler.java b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/HostIdHandler.java
index 391ce30fb..e07e6c5ee 100644
--- a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/HostIdHandler.java
+++ b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/HostIdHandler.java
@@ -28,7 +28,8 @@
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpRequest;
 import org.waarp.openr66.dao.HostDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Host;
 import org.waarp.openr66.protocol.http.restv2.converters.HostConverter;
 import org.waarp.openr66.protocol.http.restv2.utils.JsonUtils;
@@ -109,8 +110,10 @@ public void getHost(HttpRequest request, HttpResponder responder,
             ObjectNode responseObject = HostConverter.hostToNode(host);
             String responseText = JsonUtils.nodeToString(responseObject);
             responder.sendJson(OK, responseText);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (hostDAO != null) {
                 hostDAO.close();
@@ -151,8 +154,10 @@ public void updateHost(HttpRequest request, HttpResponder responder,
             String responseText = JsonUtils.nodeToString(responseObject);
             responder.sendJson(CREATED, responseText);
 
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (hostDAO != null) {
                 hostDAO.close();
@@ -183,8 +188,10 @@ public void deleteHost(HttpRequest request, HttpResponder responder,
                 hostDAO.delete(host);
                 responder.sendStatus(NO_CONTENT);
             }
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (hostDAO != null) {
                 hostDAO.close();
diff --git a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/HostsHandler.java b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/HostsHandler.java
index 6e3b8e61c..c8e91cc1b 100644
--- a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/HostsHandler.java
+++ b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/HostsHandler.java
@@ -32,7 +32,7 @@
 import org.waarp.common.role.RoleDefault.ROLE;
 import org.waarp.openr66.dao.Filter;
 import org.waarp.openr66.dao.HostDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 import org.waarp.openr66.pojo.Host;
 import org.waarp.openr66.protocol.http.restv2.RestConstants;
 import org.waarp.openr66.protocol.http.restv2.converters.HostConverter;
@@ -193,7 +193,7 @@ public void filterHosts(HttpRequest request, HttpResponder responder,
         try {
             hostDAO = DAO_FACTORY.getHostDAO();
             hosts = hostDAO.find(filters);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
         } finally {
             if (hostDAO != null) {
@@ -241,7 +241,7 @@ public void addHost(HttpRequest request, HttpResponder responder) {
             }
 
             hostDAO.insert(host);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
         } finally {
             if (hostDAO != null) {
diff --git a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/LimitsHandler.java b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/LimitsHandler.java
index 7f5caee3b..61446661f 100644
--- a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/LimitsHandler.java
+++ b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/LimitsHandler.java
@@ -28,7 +28,8 @@
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpRequest;
 import org.waarp.openr66.dao.LimitDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Limit;
 import org.waarp.openr66.protocol.http.restv2.converters.LimitsConverter;
 import org.waarp.openr66.protocol.http.restv2.errors.RestErrorException;
@@ -111,8 +112,10 @@ public void getLimits(HttpRequest request, HttpResponder responder) {
             } else {
                 responder.sendStatus(NOT_FOUND);
             }
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (limitDAO != null) {
                 limitDAO.close();
@@ -152,7 +155,7 @@ public void initializeLimits(HttpRequest request, HttpResponder responder) {
             } else {
                 throw new RestErrorException(ALREADY_EXISTING(SERVER_NAME));
             }
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
         } finally {
             if (limitDAO != null) {
@@ -197,8 +200,10 @@ public void updateLimits(HttpRequest request, HttpResponder responder) {
             String responseText = JsonUtils.nodeToString(responseObject);
             responder.sendJson(CREATED, responseText);
 
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (limitDAO != null) {
                 limitDAO.close();
@@ -228,8 +233,10 @@ public void deleteLimits(HttpRequest request, HttpResponder responder) {
             } else {
                 responder.sendStatus(NOT_FOUND);
             }
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (limitDAO != null) {
                 limitDAO.close();
diff --git a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/RuleIdHandler.java b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/RuleIdHandler.java
index dac0c12b8..50890384a 100644
--- a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/RuleIdHandler.java
+++ b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/RuleIdHandler.java
@@ -28,7 +28,8 @@
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpRequest;
 import org.waarp.openr66.dao.RuleDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Rule;
 import org.waarp.openr66.protocol.http.restv2.converters.RuleConverter;
 import org.waarp.openr66.protocol.http.restv2.utils.JsonUtils;
@@ -110,8 +111,10 @@ public void getRule(HttpRequest request, HttpResponder responder,
             ObjectNode responseObject = RuleConverter.ruleToNode(rule);
             String responseText = JsonUtils.nodeToString(responseObject);
             responder.sendJson(OK, responseText);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (ruleDAO != null) {
                 ruleDAO.close();
@@ -150,8 +153,10 @@ public void updateRule(HttpRequest request, HttpResponder responder,
             ObjectNode responseObject = RuleConverter.ruleToNode(newRule);
             String responseText = JsonUtils.nodeToString(responseObject);
             responder.sendJson(CREATED, responseText);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (ruleDAO != null) {
                 ruleDAO.close();
@@ -182,8 +187,10 @@ public void deleteRule(HttpRequest request, HttpResponder responder,
                 ruleDAO.delete(rule);
                 responder.sendStatus(NO_CONTENT);
             }
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (ruleDAO != null) {
                 ruleDAO.close();
diff --git a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/RulesHandler.java b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/RulesHandler.java
index 23a020d32..1fac76a24 100644
--- a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/RulesHandler.java
+++ b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/RulesHandler.java
@@ -32,7 +32,7 @@
 import org.waarp.common.role.RoleDefault.ROLE;
 import org.waarp.openr66.dao.Filter;
 import org.waarp.openr66.dao.RuleDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 import org.waarp.openr66.pojo.Rule;
 import org.waarp.openr66.protocol.http.restv2.converters.RuleConverter.ModeTrans;
 import org.waarp.openr66.protocol.http.restv2.converters.RuleConverter.Order;
@@ -165,7 +165,7 @@ public void filterRules(HttpRequest request, HttpResponder responder,
         try {
             ruleDAO = DAO_FACTORY.getRuleDAO();
             rules = ruleDAO.find(filters);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
         } finally {
             if (ruleDAO != null) {
@@ -213,7 +213,7 @@ public void addRule(HttpRequest request, HttpResponder responder) {
             }
 
             ruleDAO.insert(rule);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
         } finally {
             if (ruleDAO != null) {
diff --git a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/ServerHandler.java b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/ServerHandler.java
index 14bad3831..eaaf5d053 100644
--- a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/ServerHandler.java
+++ b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/ServerHandler.java
@@ -37,7 +37,8 @@
 import org.waarp.openr66.dao.HostDAO;
 import org.waarp.openr66.dao.RuleDAO;
 import org.waarp.openr66.dao.TransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Business;
 import org.waarp.openr66.pojo.Host;
 import org.waarp.openr66.pojo.Rule;
@@ -237,8 +238,10 @@ public void deactivate(HttpRequest request, HttpResponder responder) {
             DefaultHttpHeaders headers = new DefaultHttpHeaders();
             headers.add("active", host.isActive());
             responder.sendStatus(NO_CONTENT, headers);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (hostDAO != null) {
                 hostDAO.close();
@@ -432,8 +435,10 @@ public void getLogs(HttpRequest request, HttpResponder responder,
             String responseText = JsonUtils.nodeToString(responseObject);
             responder.sendJson(OK, responseText);
 
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (transferDAO != null) {
                 transferDAO.close();
@@ -566,8 +571,10 @@ public void getConfig(HttpRequest request, HttpResponder responder,
             String responseText = JsonUtils.nodeToString(responseObject);
             responder.sendJson(OK, responseText);
 
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (hostDAO != null) { hostDAO.close(); }
             if (ruleDAO != null) { ruleDAO.close(); }
@@ -731,8 +738,10 @@ public void setConfig(HttpRequest request, HttpResponder responder,
                 throw new RestErrorException(errors);
             }
 
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (hostDAO != null) { hostDAO.close(); }
             if (ruleDAO != null) { ruleDAO.close(); }
diff --git a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/TransferIdHandler.java b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/TransferIdHandler.java
index 5e944cc5e..462537203 100644
--- a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/TransferIdHandler.java
+++ b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/TransferIdHandler.java
@@ -28,7 +28,8 @@
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpRequest;
 import org.waarp.openr66.dao.TransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Transfer;
 import org.waarp.openr66.protocol.http.restv2.converters.TransferConverter;
 import org.waarp.openr66.protocol.http.restv2.utils.JsonUtils;
@@ -117,8 +118,10 @@ public void getTransfer(HttpRequest request, HttpResponder responder,
             }
         } catch (NumberFormatException e) {
             responder.sendStatus(NOT_FOUND);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (transferDAO != null) {
                 transferDAO.close();
@@ -176,8 +179,10 @@ public void restartTransfer(HttpRequest request, HttpResponder responder,
             }
         } catch (NumberFormatException e) {
             responder.sendStatus(NOT_FOUND);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (transferDAO != null) {
                 transferDAO.close();
@@ -234,8 +239,10 @@ public void stopTransfer(HttpRequest request, HttpResponder responder,
             }
         } catch (NumberFormatException e) {
             responder.sendStatus(NOT_FOUND);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (transferDAO != null) {
                 transferDAO.close();
@@ -291,8 +298,10 @@ public void cancelTransfer(HttpRequest request, HttpResponder responder,
             }
         } catch (NumberFormatException e) {
             responder.sendStatus(NOT_FOUND);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
+        } catch (DAONoDataException e) {
+            responder.sendStatus(NOT_FOUND);
         } finally {
             if (transferDAO != null) {
                 transferDAO.close();
diff --git a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/TransfersHandler.java b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/TransfersHandler.java
index 9f2f7c177..935d67958 100644
--- a/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/TransfersHandler.java
+++ b/src/main/java/org/waarp/openr66/protocol/http/restv2/dbhandlers/TransfersHandler.java
@@ -33,7 +33,7 @@
 import org.waarp.common.role.RoleDefault.ROLE;
 import org.waarp.openr66.dao.Filter;
 import org.waarp.openr66.dao.TransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 import org.waarp.openr66.pojo.Transfer;
 import org.waarp.openr66.protocol.http.restv2.converters.TransferConverter;
 import org.waarp.openr66.protocol.http.restv2.errors.RestError;
@@ -200,7 +200,7 @@ public void filterTransfer(HttpRequest request, HttpResponder responder,
             transferDAO = DAO_FACTORY.getTransferDAO();
             transferList = transferDAO.find(filters, order.column, order.ascend,
                     limit, offset);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
         } finally {
             if (transferDAO != null) {
@@ -238,7 +238,7 @@ public void createTransfer(HttpRequest request, HttpResponder responder) {
         try {
             transferDAO = DAO_FACTORY.getTransferDAO();
             transferDAO.insert(transfer);
-        } catch (DAOException e) {
+        } catch (DAOConnectionException e) {
             throw new InternalServerErrorException(e);
         } finally {
             if (transferDAO != null) {
diff --git a/src/main/java/org/waarp/openr66/protocol/http/restv2/resthandlers/RestHandlerHook.java b/src/main/java/org/waarp/openr66/protocol/http/restv2/resthandlers/RestHandlerHook.java
index ee0b2fe43..1f66dfe58 100644
--- a/src/main/java/org/waarp/openr66/protocol/http/restv2/resthandlers/RestHandlerHook.java
+++ b/src/main/java/org/waarp/openr66/protocol/http/restv2/resthandlers/RestHandlerHook.java
@@ -33,7 +33,8 @@
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.common.utility.Base64;
 import org.waarp.openr66.dao.HostDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Host;
 import org.waarp.openr66.protocol.http.restv2.RestServiceInitializer;
 import org.waarp.openr66.protocol.http.restv2.converters.HostConfigConverter;
@@ -288,7 +289,9 @@ private String checkCredentials(HttpRequest request) {
                     throw new NotAllowedException("User does not exist.");
                 }
                 host = hostDAO.select(user);
-            } catch (DAOException e) {
+            } catch (DAOConnectionException e) {
+                throw new InternalServerErrorException(e);
+            } catch (DAONoDataException e) {
                 throw new InternalServerErrorException(e);
             } finally {
                 if (hostDAO != null) {
@@ -338,7 +341,9 @@ private String checkCredentials(HttpRequest request) {
                     throw new NotAllowedException("User does not exist.");
                 }
                 host = hostDAO.select(authUser);
-            } catch (DAOException e) {
+            } catch (DAOConnectionException e) {
+                throw new InternalServerErrorException(e);
+            } catch (DAONoDataException e) {
                 throw new InternalServerErrorException(e);
             } finally {
                 if (hostDAO != null) {
diff --git a/src/main/java/org/waarp/openr66/protocol/localhandler/ConnectionActions.java b/src/main/java/org/waarp/openr66/protocol/localhandler/ConnectionActions.java
index d0318f608..9e631679b 100644
--- a/src/main/java/org/waarp/openr66/protocol/localhandler/ConnectionActions.java
+++ b/src/main/java/org/waarp/openr66/protocol/localhandler/ConnectionActions.java
@@ -369,7 +369,8 @@ public void authent(Channel channel, AuthentPacket packet, boolean isSsl)
             session.newState(AUTHENTR);
         }
 
-        System.err.println(localChannelReference == null);
+        logger.debug("LocalChannelReference null? {}",
+                     localChannelReference == null);
         if (localChannelReference.getDbSession() != null) {
             localChannelReference.getDbSession().useConnection();
         }
diff --git a/src/main/java/org/waarp/openr66/protocol/localhandler/LocalTransaction.java b/src/main/java/org/waarp/openr66/protocol/localhandler/LocalTransaction.java
index 89231c8d5..aeade7362 100644
--- a/src/main/java/org/waarp/openr66/protocol/localhandler/LocalTransaction.java
+++ b/src/main/java/org/waarp/openr66/protocol/localhandler/LocalTransaction.java
@@ -102,8 +102,6 @@ public LocalTransaction() {
         serverBootstrap.channel(LocalServerChannel.class);
         serverBootstrap.group(Configuration.configuration.getLocalBossGroup(),
                 Configuration.configuration.getLocalWorkerGroup());
-        serverBootstrap.option(ChannelOption.TCP_NODELAY, true);
-        serverBootstrap.option(ChannelOption.SO_REUSEADDR, true);
         serverBootstrap.childOption(ChannelOption.CONNECT_TIMEOUT_MILLIS, (int) Configuration.configuration.getTIMEOUTCON());
         serverBootstrap.childHandler(new LocalServerInitializer());
         try {
diff --git a/src/main/java/org/waarp/openr66/protocol/localhandler/ServerActions.java b/src/main/java/org/waarp/openr66/protocol/localhandler/ServerActions.java
index 0d63a853c..e41ebf47c 100644
--- a/src/main/java/org/waarp/openr66/protocol/localhandler/ServerActions.java
+++ b/src/main/java/org/waarp/openr66/protocol/localhandler/ServerActions.java
@@ -2373,6 +2373,7 @@ public final ValidPacket informationRequest(long id, boolean isTo, String remote
         }
         DbTaskRunner runner = null;
         if (isTo) {
+            logger.info("{} {} {}", id, remote, local);
             try {
                 runner = new DbTaskRunner(session, null, id, remote, local);
             } catch (WaarpDatabaseException e) {
diff --git a/src/main/java/org/waarp/openr66/protocol/utils/Version.java b/src/main/java/org/waarp/openr66/protocol/utils/Version.java
index 5eafe65e8..a4fa803b6 100644
--- a/src/main/java/org/waarp/openr66/protocol/utils/Version.java
+++ b/src/main/java/org/waarp/openr66/protocol/utils/Version.java
@@ -3,7 +3,7 @@
 /** Provides the version information of Waarp OpenR66. */
 public final class Version {
  /** The version identifier. */
- public static final String ID = "3.1.0";
+ public static final String ID = "3.1.1";
  /** Prints out the version identifier to stdout. */
  public static void main(String[] args) { System.out.println(ID); }
  private Version() { super(); }
diff --git a/src/test/java/org/waarp/openr66/dao/database/DBAllDAOTest.java b/src/test/java/org/waarp/openr66/dao/database/DBAllDAOTest.java
index 9e1ae1fab..0c016dda7 100644
--- a/src/test/java/org/waarp/openr66/dao/database/DBAllDAOTest.java
+++ b/src/test/java/org/waarp/openr66/dao/database/DBAllDAOTest.java
@@ -25,13 +25,15 @@
 import org.junit.Test;
 import org.waarp.openr66.context.ErrorCode;
 import org.waarp.openr66.dao.BusinessDAO;
+import org.waarp.openr66.dao.DAOFactory;
 import org.waarp.openr66.dao.Filter;
 import org.waarp.openr66.dao.HostDAO;
 import org.waarp.openr66.dao.LimitDAO;
 import org.waarp.openr66.dao.MultipleMonitorDAO;
 import org.waarp.openr66.dao.RuleDAO;
 import org.waarp.openr66.dao.TransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
 import org.waarp.openr66.pojo.Business;
 import org.waarp.openr66.pojo.Host;
 import org.waarp.openr66.pojo.Limit;
@@ -54,6 +56,75 @@
 public abstract class DBAllDAOTest {
 
   private Connection con;
+  private DAOFactoryTest factoryTest = new DAOFactoryTest();
+
+  public DAOFactory getDaoFactory() {
+    return factoryTest;
+  }
+
+  class DAOFactoryTest extends DAOFactory {
+
+    @Override
+    public BusinessDAO getBusinessDAO() throws DAOConnectionException {
+      try {
+        return new DBBusinessDAO(getConnection());
+      } catch (SQLException e) {
+        fail(e.getMessage());
+        return null;
+      }
+    }
+
+    @Override
+    public HostDAO getHostDAO() throws DAOConnectionException {
+      try {
+        return new DBHostDAO(getConnection());
+      } catch (SQLException e) {
+        fail(e.getMessage());
+        return null;
+      }
+    }
+
+    @Override
+    public LimitDAO getLimitDAO() throws DAOConnectionException {
+      try {
+        return new DBLimitDAO(getConnection());
+      } catch (SQLException e) {
+        fail(e.getMessage());
+        return null;
+      }
+    }
+
+    @Override
+    public MultipleMonitorDAO getMultipleMonitorDAO()
+        throws DAOConnectionException {
+      try {
+        return new DBMultipleMonitorDAO(getConnection());
+      } catch (SQLException e) {
+        fail(e.getMessage());
+        return null;
+      }
+    }
+
+    @Override
+    public RuleDAO getRuleDAO() throws DAOConnectionException {
+      try {
+        return new DBRuleDAO(getConnection());
+      } catch (SQLException e) {
+        fail(e.getMessage());
+        return null;
+      }
+    }
+
+    @Override
+    public TransferDAO getTransferDAO() throws DAOConnectionException {
+      try {
+        return getDAO(getConnection());
+      } catch (SQLException e) {
+        fail(e.getMessage());
+        return null;
+      }
+    }
+  }
 
   public void runScript(String script) {
     try {
@@ -84,7 +155,9 @@ public void setUp() {
   public void wrapUp() {
     try {
       cleanDB();
-      con.close();
+      if (con != null) {
+        con.close();
+      }
     } catch (Exception e) {
       fail(e.getMessage());
     }
@@ -92,13 +165,14 @@ public void wrapUp() {
 
   public abstract void cleanDB() throws SQLException;
 
+
   /*******************
    * BUSINESS
    *******************/
   @Test
   public void testDeleteAllBusiness() {
     try {
-      BusinessDAO dao = new DBBusinessDAO(getConnection());
+      BusinessDAO dao = getDaoFactory().getBusinessDAO();
       dao.deleteAll();
 
       ResultSet res = con.createStatement()
@@ -112,7 +186,7 @@ public void testDeleteAllBusiness() {
   @Test
   public void testDeleteBusiness() {
     try {
-      BusinessDAO dao = new DBBusinessDAO(getConnection());
+      BusinessDAO dao = getDaoFactory().getBusinessDAO();
       dao.delete(new Business("server1", "", "", "", ""));
 
       ResultSet res = con.createStatement()
@@ -127,7 +201,7 @@ public void testDeleteBusiness() {
   @Test
   public void testGetAllBusiness() {
     try {
-      BusinessDAO dao = new DBBusinessDAO(getConnection());
+      BusinessDAO dao = getDaoFactory().getBusinessDAO();
       assertEquals(5, dao.getAll().size());
     } catch (Exception e) {
       fail(e.getMessage());
@@ -137,16 +211,21 @@ public void testGetAllBusiness() {
   @Test
   public void testSelectBusiness() {
     try {
-      BusinessDAO dao = new DBBusinessDAO(getConnection());
+      BusinessDAO dao = getDaoFactory().getBusinessDAO();
       Business business = dao.select("server1");
-      Business business2 = dao.select("ghost");
 
       assertEquals("joyaux", business.getBusiness());
       assertEquals("marchand", business.getRoles());
       assertEquals("le borgne", business.getAliases());
       assertEquals("misc", business.getOthers());
       assertEquals(UpdatedInfo.NOTUPDATED, business.getUpdatedInfo());
-      assertEquals(null, business2);
+
+      try {
+        dao.select("ghost");
+        fail("Should raised an exception");
+      } catch (DAONoDataException e) {
+        // Ignore since OK
+      }
     } catch (Exception e) {
       fail(e.getMessage());
     }
@@ -155,7 +234,7 @@ public void testSelectBusiness() {
   @Test
   public void testExistBusiness() {
     try {
-      BusinessDAO dao = new DBBusinessDAO(getConnection());
+      BusinessDAO dao = getDaoFactory().getBusinessDAO();
       assertEquals(true, dao.exist("server1"));
       assertEquals(false, dao.exist("ghost"));
     } catch (Exception e) {
@@ -167,7 +246,7 @@ public void testExistBusiness() {
   @Test
   public void testInsertBusiness() {
     try {
-      BusinessDAO dao = new DBBusinessDAO(getConnection());
+      BusinessDAO dao = getDaoFactory().getBusinessDAO();
       dao.insert(new Business("chacha",
                               "lolo", "lala", "minou", "ect",
                               UpdatedInfo.TOSUBMIT));
@@ -196,7 +275,7 @@ public void testInsertBusiness() {
   @Test
   public void testUpdateBusiness() {
     try {
-      BusinessDAO dao = new DBBusinessDAO(getConnection());
+      BusinessDAO dao = getDaoFactory().getBusinessDAO();
       dao.update(new Business("server2",
                               "lolo", "lala", "minou", "ect",
                               UpdatedInfo.RUNNING));
@@ -222,7 +301,7 @@ public void testFindBusiness() {
     ArrayList<Filter> map = new ArrayList<Filter>();
     map.add(new Filter(DBBusinessDAO.BUSINESS_FIELD, "=", "ba"));
     try {
-      BusinessDAO dao = new DBBusinessDAO(getConnection());
+      BusinessDAO dao = getDaoFactory().getBusinessDAO();
       assertEquals(2, dao.find(map).size());
     } catch (Exception e) {
       fail(e.getMessage());
@@ -236,7 +315,7 @@ public void testFindBusiness() {
   @Test
   public void testDeleteAllHost() {
     try {
-      HostDAO dao = new DBHostDAO(getConnection());
+      HostDAO dao = getDaoFactory().getHostDAO();
       dao.deleteAll();
 
       ResultSet res = con.createStatement()
@@ -250,7 +329,7 @@ public void testDeleteAllHost() {
   @Test
   public void testDeleteHost() {
     try {
-      HostDAO dao = new DBHostDAO(getConnection());
+      HostDAO dao = getDaoFactory().getHostDAO();
       dao.delete(new Host("server1", "", 666, null, false, false));
 
       ResultSet res = con.createStatement()
@@ -265,7 +344,7 @@ public void testDeleteHost() {
   @Test
   public void testGetAllHost() {
     try {
-      HostDAO dao = new DBHostDAO(getConnection());
+      HostDAO dao = getDaoFactory().getHostDAO();
       assertEquals(3, dao.getAll().size());
     } catch (Exception e) {
       fail(e.getMessage());
@@ -275,9 +354,8 @@ public void testGetAllHost() {
   @Test
   public void testSelectHost() {
     try {
-      HostDAO dao = new DBHostDAO(getConnection());
+      HostDAO dao = getDaoFactory().getHostDAO();
       Host host = dao.select("server1");
-      Host host2 = dao.select("ghost");
 
       assertEquals("server1", host.getHostid());
       assertEquals("127.0.0.1", host.getAddress());
@@ -290,7 +368,12 @@ public void testSelectHost() {
       assertEquals(false, host.isActive());
       assertEquals(UpdatedInfo.TOSUBMIT, host.getUpdatedInfo());
 
-      assertEquals(null, host2);
+      try {
+        dao.select("ghost");
+        fail("Should raised an exception");
+      } catch (DAONoDataException e) {
+        // Ignore since OK
+      }
     } catch (Exception e) {
       fail(e.getMessage());
     }
@@ -299,7 +382,7 @@ public void testSelectHost() {
   @Test
   public void testExistHost() {
     try {
-      HostDAO dao = new DBHostDAO(getConnection());
+      HostDAO dao = getDaoFactory().getHostDAO();
       assertEquals(true, dao.exist("server1"));
       assertEquals(false, dao.exist("ghost"));
     } catch (Exception e) {
@@ -311,7 +394,7 @@ public void testExistHost() {
   @Test
   public void testInsertHost() {
     try {
-      HostDAO dao = new DBHostDAO(getConnection());
+      HostDAO dao = getDaoFactory().getHostDAO();
       dao.insert(
           new Host("chacha", "address", 666, "aaa".getBytes("utf-8"), false,
                    false));
@@ -343,7 +426,7 @@ public void testInsertHost() {
   @Test
   public void testUpdateHost() {
     try {
-      HostDAO dao = new DBHostDAO(getConnection());
+      HostDAO dao = getDaoFactory().getHostDAO();
       dao.update(
           new Host("server2", "address", 666, "password".getBytes("utf-8"),
                    false, false));
@@ -373,7 +456,7 @@ public void testFindHost() {
     ArrayList<Filter> map = new ArrayList<Filter>();
     map.add(new Filter(DBHostDAO.ADDRESS_FIELD, "=", "127.0.0.1"));
     try {
-      HostDAO dao = new DBHostDAO(getConnection());
+      HostDAO dao = getDaoFactory().getHostDAO();
       assertEquals(2, dao.find(map).size());
     } catch (Exception e) {
       e.printStackTrace();
@@ -389,7 +472,7 @@ public void testFindHost() {
   @Test
   public void testDeleteAllLimit() {
     try {
-      LimitDAO dao = new DBLimitDAO(getConnection());
+      LimitDAO dao = getDaoFactory().getLimitDAO();
       dao.deleteAll();
 
       ResultSet res = con.createStatement()
@@ -403,7 +486,7 @@ public void testDeleteAllLimit() {
   @Test
   public void testDeleteLimit() {
     try {
-      LimitDAO dao = new DBLimitDAO(getConnection());
+      LimitDAO dao = getDaoFactory().getLimitDAO();
       dao.delete(new Limit("server1", 0l));
 
       ResultSet res = con.createStatement()
@@ -418,7 +501,7 @@ public void testDeleteLimit() {
   @Test
   public void testGetAllLimit() {
     try {
-      LimitDAO dao = new DBLimitDAO(getConnection());
+      LimitDAO dao = getDaoFactory().getLimitDAO();
       assertEquals(3, dao.getAll().size());
     } catch (Exception e) {
       fail(e.getMessage());
@@ -428,9 +511,8 @@ public void testGetAllLimit() {
   @Test
   public void testSelectLimit() {
     try {
-      LimitDAO dao = new DBLimitDAO(getConnection());
+      LimitDAO dao = getDaoFactory().getLimitDAO();
       Limit limit = dao.select("server1");
-      Limit limit2 = dao.select("ghost");
 
       assertEquals("server1", limit.getHostid());
       assertEquals(1, limit.getReadGlobalLimit());
@@ -439,7 +521,13 @@ public void testSelectLimit() {
       assertEquals(4, limit.getWriteSessionLimit());
       assertEquals(5, limit.getDelayLimit());
       assertEquals(UpdatedInfo.NOTUPDATED, limit.getUpdatedInfo());
-      assertEquals(null, limit2);
+
+      try {
+        dao.select("ghost");
+        fail("Should raised an exception");
+      } catch (DAONoDataException e) {
+        // Ignore since OK
+      }
     } catch (Exception e) {
       fail(e.getMessage());
     }
@@ -448,7 +536,7 @@ public void testSelectLimit() {
   @Test
   public void testExistLimit() {
     try {
-      LimitDAO dao = new DBLimitDAO(getConnection());
+      LimitDAO dao = getDaoFactory().getLimitDAO();
       assertEquals(true, dao.exist("server1"));
       assertEquals(false, dao.exist("ghost"));
     } catch (Exception e) {
@@ -460,7 +548,7 @@ public void testExistLimit() {
   @Test
   public void testInsertLimit() {
     try {
-      LimitDAO dao = new DBLimitDAO(getConnection());
+      LimitDAO dao = getDaoFactory().getLimitDAO();
       dao.insert(new Limit("chacha", 4l,
                            1l, 5l, 13l, 12,
                            UpdatedInfo.TOSUBMIT));
@@ -490,7 +578,7 @@ public void testInsertLimit() {
   @Test
   public void testUpdateLimit() {
     try {
-      LimitDAO dao = new DBLimitDAO(getConnection());
+      LimitDAO dao = getDaoFactory().getLimitDAO();
       dao.update(new Limit("server2", 4l,
                            1l, 5l, 13l, 12l,
                            UpdatedInfo.RUNNING));
@@ -517,7 +605,7 @@ public void testFindLimit() {
     ArrayList<Filter> map = new ArrayList<Filter>();
     map.add(new Filter(DBLimitDAO.READ_SESSION_LIMIT_FIELD, ">", 2));
     try {
-      LimitDAO dao = new DBLimitDAO(getConnection());
+      LimitDAO dao = getDaoFactory().getLimitDAO();
       assertEquals(2, dao.find(map).size());
     } catch (Exception e) {
       fail(e.getMessage());
@@ -533,7 +621,11 @@ public void testFindLimit() {
   @Test
   public void testDeleteAllMultipleMonitor() {
     try {
-      MultipleMonitorDAO dao = new DBMultipleMonitorDAO(getConnection());
+      MultipleMonitorDAO dao = getDaoFactory().getMultipleMonitorDAO();
+      if (dao == null) {
+        // ignore since XML
+        return;
+      }
       dao.deleteAll();
 
       ResultSet res = con.createStatement()
@@ -547,7 +639,11 @@ public void testDeleteAllMultipleMonitor() {
   @Test
   public void testDeleteMultipleMonitor() {
     try {
-      MultipleMonitorDAO dao = new DBMultipleMonitorDAO(getConnection());
+      MultipleMonitorDAO dao = getDaoFactory().getMultipleMonitorDAO();
+      if (dao == null) {
+        // ignore since XML
+        return;
+      }
       dao.delete(new MultipleMonitor("server1", 0, 0, 0));
 
       ResultSet res = con.createStatement()
@@ -562,7 +658,11 @@ public void testDeleteMultipleMonitor() {
   @Test
   public void testGetAllMultipleMonitor() {
     try {
-      MultipleMonitorDAO dao = new DBMultipleMonitorDAO(getConnection());
+      MultipleMonitorDAO dao = getDaoFactory().getMultipleMonitorDAO();
+      if (dao == null) {
+        // ignore since XML
+        return;
+      }
       assertEquals(4, dao.getAll().size());
     } catch (Exception e) {
       fail(e.getMessage());
@@ -572,15 +672,23 @@ public void testGetAllMultipleMonitor() {
   @Test
   public void testSelectMultipleMonitor() {
     try {
-      MultipleMonitorDAO dao = new DBMultipleMonitorDAO(getConnection());
+      MultipleMonitorDAO dao = getDaoFactory().getMultipleMonitorDAO();
+      if (dao == null) {
+        // ignore since XML
+        return;
+      }
       MultipleMonitor multiple = dao.select("server1");
-      MultipleMonitor multiple2 = dao.select("ghost");
 
       assertEquals("server1", multiple.getHostid());
       assertEquals(11, multiple.getCountConfig());
       assertEquals(29, multiple.getCountRule());
       assertEquals(18, multiple.getCountHost());
-      assertEquals(null, multiple2);
+      try {
+        dao.select("ghost");
+        fail("Should raised an exception");
+      } catch (DAONoDataException e) {
+        // Ignore since OK
+      }
     } catch (Exception e) {
       fail(e.getMessage());
     }
@@ -589,7 +697,11 @@ public void testSelectMultipleMonitor() {
   @Test
   public void testExistMultipleMonitor() {
     try {
-      MultipleMonitorDAO dao = new DBMultipleMonitorDAO(getConnection());
+      MultipleMonitorDAO dao = getDaoFactory().getMultipleMonitorDAO();
+      if (dao == null) {
+        // ignore since XML
+        return;
+      }
       assertEquals(true, dao.exist("server1"));
       assertEquals(false, dao.exist("ghost"));
     } catch (Exception e) {
@@ -601,7 +713,11 @@ public void testExistMultipleMonitor() {
   @Test
   public void testInsertMultipleMonitor() {
     try {
-      MultipleMonitorDAO dao = new DBMultipleMonitorDAO(getConnection());
+      MultipleMonitorDAO dao = getDaoFactory().getMultipleMonitorDAO();
+      if (dao == null) {
+        // ignore since XML
+        return;
+      }
       dao.insert(new MultipleMonitor("chacha", 31, 19, 98));
 
       ResultSet res = con.createStatement()
@@ -626,7 +742,11 @@ public void testInsertMultipleMonitor() {
   @Test
   public void testUpdateMultipleMonitor() {
     try {
-      MultipleMonitorDAO dao = new DBMultipleMonitorDAO(getConnection());
+      MultipleMonitorDAO dao = getDaoFactory().getMultipleMonitorDAO();
+      if (dao == null) {
+        // ignore since XML
+        return;
+      }
       dao.update(new MultipleMonitor("server2", 31, 19, 98));
 
       ResultSet res = con.createStatement()
@@ -648,7 +768,11 @@ public void testFindMultipleMonitor() {
     ArrayList<Filter> map = new ArrayList<Filter>();
     map.add(new Filter(DBMultipleMonitorDAO.COUNT_CONFIG_FIELD, "=", 0));
     try {
-      MultipleMonitorDAO dao = new DBMultipleMonitorDAO(getConnection());
+      MultipleMonitorDAO dao = getDaoFactory().getMultipleMonitorDAO();
+      if (dao == null) {
+        // ignore since XML
+        return;
+      }
       assertEquals(2, dao.find(map).size());
     } catch (Exception e) {
       fail(e.getMessage());
@@ -664,7 +788,7 @@ public void testFindMultipleMonitor() {
   @Test
   public void testDeleteAllRule() {
     try {
-      RuleDAO dao = new DBRuleDAO(getConnection());
+      RuleDAO dao = getDaoFactory().getRuleDAO();
       dao.deleteAll();
 
       ResultSet res = con.createStatement()
@@ -678,7 +802,7 @@ public void testDeleteAllRule() {
   @Test
   public void testDeleteRule() {
     try {
-      RuleDAO dao = new DBRuleDAO(getConnection());
+      RuleDAO dao = getDaoFactory().getRuleDAO();
       dao.delete(new Rule("default", 1));
 
       ResultSet res = con.createStatement()
@@ -693,7 +817,7 @@ public void testDeleteRule() {
   @Test
   public void testGetAllRule() {
     try {
-      RuleDAO dao = new DBRuleDAO(getConnection());
+      RuleDAO dao = getDaoFactory().getRuleDAO();
       assertEquals(3, dao.getAll().size());
     } catch (Exception e) {
       fail(e.getMessage());
@@ -703,9 +827,8 @@ public void testGetAllRule() {
   @Test
   public void testSelectRule() {
     try {
-      RuleDAO dao = new DBRuleDAO(getConnection());
+      RuleDAO dao = getDaoFactory().getRuleDAO();
       Rule rule = dao.select("dummy");
-      Rule rule2 = dao.select("ghost");
 
       assertEquals("dummy", rule.getName());
       assertEquals(1, rule.getMode());
@@ -721,7 +844,12 @@ public void testSelectRule() {
       assertEquals(0, rule.getSPostTasks().size());
       assertEquals(0, rule.getSErrorTasks().size());
       assertEquals(UpdatedInfo.UNKNOWN, rule.getUpdatedInfo());
-      assertEquals(null, rule2);
+      try {
+        dao.select("ghost");
+        fail("Should raised an exception");
+      } catch (DAONoDataException e) {
+        // Ignore since OK
+      }
     } catch (Exception e) {
       fail(e.getMessage());
     }
@@ -730,7 +858,7 @@ public void testSelectRule() {
   @Test
   public void testExistRule() {
     try {
-      RuleDAO dao = new DBRuleDAO(getConnection());
+      RuleDAO dao = getDaoFactory().getRuleDAO();
       assertEquals(true, dao.exist("dummy"));
       assertEquals(false, dao.exist("ghost"));
     } catch (Exception e) {
@@ -742,7 +870,7 @@ public void testExistRule() {
   @Test
   public void testInsertRule() {
     try {
-      RuleDAO dao = new DBRuleDAO(getConnection());
+      RuleDAO dao = getDaoFactory().getRuleDAO();
       dao.insert(new Rule("chacha", 2));
 
       ResultSet res = con.createStatement()
@@ -780,7 +908,7 @@ public void testInsertRule() {
   @Test
   public void testUpdateRule() {
     try {
-      RuleDAO dao = new DBRuleDAO(getConnection());
+      RuleDAO dao = getDaoFactory().getRuleDAO();
       dao.update(new Rule("dummy", 2));
 
       ResultSet res = con.createStatement()
@@ -816,7 +944,7 @@ public void testFindRule() {
     ArrayList<Filter> map = new ArrayList<Filter>();
     map.add(new Filter(DBRuleDAO.MODE_TRANS_FIELD, "=", 1));
     try {
-      RuleDAO dao = new DBRuleDAO(getConnection());
+      RuleDAO dao = getDaoFactory().getRuleDAO();
       assertEquals(2, dao.find(map).size());
     } catch (Exception e) {
       fail(e.getMessage());
@@ -838,7 +966,8 @@ public void testDeleteAllTransfer() throws Exception {
     assertEquals(false, res.next());
   }
 
-  public abstract TransferDAO getDAO(Connection con) throws DAOException;
+  public abstract TransferDAO getDAO(Connection con) throws
+                                                     DAOConnectionException;
 
   @Test
   public void testDeleteTransfer() throws Exception {
@@ -866,10 +995,14 @@ public void testGetAllTransfer() throws Exception {
   public void testSelectTransfer() throws Exception {
     TransferDAO dao = getDAO(getConnection());
     Transfer transfer = dao.select(0l, "server1", "server2", "server1");
-    Transfer transfer2 = dao.select(1l, "server1", "server2", "server1");
 
     assertEquals(0, transfer.getId());
-    assertEquals(null, transfer2);
+    try {
+      dao.select(1l, "server1", "server2", "server1");
+      fail("Should raised an exception");
+    } catch (DAONoDataException e) {
+      // Ignore since OK
+    }
   }
 
   @Test
diff --git a/src/test/java/org/waarp/openr66/dao/database/h2/DbH2DAOTest.java b/src/test/java/org/waarp/openr66/dao/database/h2/DbH2DAOTest.java
index fd302e063..656bd11c0 100644
--- a/src/test/java/org/waarp/openr66/dao/database/h2/DbH2DAOTest.java
+++ b/src/test/java/org/waarp/openr66/dao/database/h2/DbH2DAOTest.java
@@ -22,12 +22,13 @@
 
 import org.waarp.openr66.dao.database.DBAllDAOTest;
 import org.waarp.openr66.dao.database.DBTransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
+
 public class DbH2DAOTest extends DBAllDAOTest {
 
   private String createScript = "h2/create.sql";
@@ -54,7 +55,7 @@ public void cleanDB() {
   }
 
   @Override
-  public DBTransferDAO getDAO(Connection con) throws DAOException {
+  public DBTransferDAO getDAO(Connection con) throws DAOConnectionException {
     return new H2TransferDAO(con);
   }
 
diff --git a/src/test/java/org/waarp/openr66/dao/database/mariadb/DbMariadbDAOTest.java b/src/test/java/org/waarp/openr66/dao/database/mariadb/DbMariadbDAOTest.java
index d28cddd55..b85ef5650 100644
--- a/src/test/java/org/waarp/openr66/dao/database/mariadb/DbMariadbDAOTest.java
+++ b/src/test/java/org/waarp/openr66/dao/database/mariadb/DbMariadbDAOTest.java
@@ -24,8 +24,7 @@
 import org.testcontainers.containers.MariaDBContainer;
 import org.waarp.openr66.dao.database.DBAllDAOTest;
 import org.waarp.openr66.dao.database.DBTransferDAO;
-import org.waarp.openr66.dao.database.h2.H2TransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -40,7 +39,7 @@ public class DbMariadbDAOTest extends DBAllDAOTest {
   private String cleanScript = "mariadb/clean.sql";
 
   @Override
-  public DBTransferDAO getDAO(Connection con) throws DAOException {
+  public DBTransferDAO getDAO(Connection con) throws DAOConnectionException {
     return new MariaDBTransferDAO(con);
   }
 
diff --git a/src/test/java/org/waarp/openr66/dao/database/mySQL/DBMySQLDAOTransfer.java b/src/test/java/org/waarp/openr66/dao/database/mySQL/DBMySQLDAOTest.java
similarity index 91%
rename from src/test/java/org/waarp/openr66/dao/database/mySQL/DBMySQLDAOTransfer.java
rename to src/test/java/org/waarp/openr66/dao/database/mySQL/DBMySQLDAOTest.java
index 075a5c07a..022291faf 100644
--- a/src/test/java/org/waarp/openr66/dao/database/mySQL/DBMySQLDAOTransfer.java
+++ b/src/test/java/org/waarp/openr66/dao/database/mySQL/DBMySQLDAOTest.java
@@ -25,13 +25,13 @@
 import org.waarp.openr66.dao.database.DBAllDAOTest;
 import org.waarp.openr66.dao.database.DBTransferDAO;
 import org.waarp.openr66.dao.database.mariadb.MariaDBTransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
-public class DBMySQLDAOTransfer extends DBAllDAOTest {
+public class DBMySQLDAOTest extends DBAllDAOTest {
 
   @ClassRule
   public static MySQLContainer db = new MySQLContainer();
@@ -40,7 +40,7 @@ public class DBMySQLDAOTransfer extends DBAllDAOTest {
   private String cleanScript = "mysql/clean.sql";
 
   @Override
-  public DBTransferDAO getDAO(Connection con) throws DAOException {
+  public DBTransferDAO getDAO(Connection con) throws DAOConnectionException {
     return new MariaDBTransferDAO(con);
   }
 
diff --git a/src/test/java/org/waarp/openr66/dao/database/oracle/DBOracleDBDAOTest.java b/src/test/java/org/waarp/openr66/dao/database/oracle/DBOracleDBDAOTest.java
index 1fe786fdb..4c483022a 100644
--- a/src/test/java/org/waarp/openr66/dao/database/oracle/DBOracleDBDAOTest.java
+++ b/src/test/java/org/waarp/openr66/dao/database/oracle/DBOracleDBDAOTest.java
@@ -24,7 +24,7 @@
 import org.testcontainers.containers.OracleContainer;
 import org.waarp.openr66.dao.database.DBAllDAOTest;
 import org.waarp.openr66.dao.database.DBTransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -40,7 +40,7 @@ public class DBOracleDBDAOTest extends DBAllDAOTest {
   private String cleanScript = "oracle/clean.sql";
 
   @Override
-  public DBTransferDAO getDAO(Connection con) throws DAOException {
+  public DBTransferDAO getDAO(Connection con) throws DAOConnectionException {
     return new OracleTransferDAO(con);
   }
 
diff --git a/src/test/java/org/waarp/openr66/dao/database/postgres/DBPostgreSQLDAOTest.java b/src/test/java/org/waarp/openr66/dao/database/postgres/DBPostgreSQLDAOTest.java
index 30471c6dc..e2d6e6c3b 100644
--- a/src/test/java/org/waarp/openr66/dao/database/postgres/DBPostgreSQLDAOTest.java
+++ b/src/test/java/org/waarp/openr66/dao/database/postgres/DBPostgreSQLDAOTest.java
@@ -24,7 +24,7 @@
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.waarp.openr66.dao.database.DBAllDAOTest;
 import org.waarp.openr66.dao.database.DBTransferDAO;
-import org.waarp.openr66.dao.exception.DAOException;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -39,7 +39,7 @@ public class DBPostgreSQLDAOTest extends DBAllDAOTest {
   private String cleanScript = "postgresql/clean.sql";
 
   @Override
-  public DBTransferDAO getDAO(Connection con) throws DAOException {
+  public DBTransferDAO getDAO(Connection con) throws DAOConnectionException {
     return new PostgreSQLTransferDAO(con);
   }
 
diff --git a/src/test/java/org/waarp/openr66/dao/database/xml/DbXmlDAOTestNo.java b/src/test/java/org/waarp/openr66/dao/database/xml/DbXmlDAOTestNo.java
new file mode 100644
index 000000000..1501a720b
--- /dev/null
+++ b/src/test/java/org/waarp/openr66/dao/database/xml/DbXmlDAOTestNo.java
@@ -0,0 +1,193 @@
+/*******************************************************************************
+ * This file is part of Waarp Project (named also Waarp or GG).
+ *
+ *  Copyright (c) 2019, Waarp SAS, and individual contributors by the @author
+ *  tags. See the COPYRIGHT.txt in the distribution for a full listing of
+ *  individual contributors.
+ *
+ *  All Waarp Project is free software: you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or (at your
+ *  option) any later version.
+ *
+ *  Waarp is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ *  A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  Waarp . If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+package org.waarp.openr66.dao.database.xml;
+
+import org.waarp.openr66.dao.BusinessDAO;
+import org.waarp.openr66.dao.DAOFactory;
+import org.waarp.openr66.dao.HostDAO;
+import org.waarp.openr66.dao.LimitDAO;
+import org.waarp.openr66.dao.MultipleMonitorDAO;
+import org.waarp.openr66.dao.RuleDAO;
+import org.waarp.openr66.dao.TransferDAO;
+import org.waarp.openr66.dao.database.DBAllDAOTest;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.xml.XMLBusinessDAO;
+import org.waarp.openr66.dao.xml.XMLHostDAO;
+import org.waarp.openr66.dao.xml.XMLRuleDAO;
+import org.waarp.openr66.dao.xml.XMLTransferDAO;
+import org.waarp.openr66.dao.xml.XMLLimitDAO;
+import org.waarp.openr66.pojo.Host;
+import org.waarp.openr66.pojo.Limit;
+import org.waarp.openr66.pojo.Rule;
+import org.waarp.openr66.pojo.Transfer;
+import org.waarp.openr66.pojo.UpdatedInfo;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import static org.junit.Assert.*;
+
+/**
+ * Not ready for tests
+ */
+public abstract class DbXmlDAOTestNo extends DBAllDAOTest {
+  static final String path = "/tmp/R66/arch";
+  DAOFactoryTest factoryTest = new DAOFactoryTest();
+
+  @Override
+  public DAOFactory getDaoFactory() {
+    return factoryTest;
+  }
+
+  class DAOFactoryTest extends DAOFactory {
+
+    @Override
+    public BusinessDAO getBusinessDAO() throws DAOConnectionException {
+      return new XMLBusinessDAO(path);
+    }
+
+    @Override
+    public HostDAO getHostDAO() throws DAOConnectionException {
+      return new XMLHostDAO(path);
+    }
+
+    @Override
+    public LimitDAO getLimitDAO() throws DAOConnectionException {
+      return new XMLLimitDAO(path);
+    }
+
+    @Override
+    public MultipleMonitorDAO getMultipleMonitorDAO()
+        throws DAOConnectionException {
+      return null;
+    }
+
+    @Override
+    public RuleDAO getRuleDAO() throws DAOConnectionException {
+      return new XMLRuleDAO(path);
+    }
+
+    @Override
+    public TransferDAO getTransferDAO() throws DAOConnectionException {
+      try {
+        return getDAO(getConnection());
+      } catch (SQLException e) {
+        fail(e.getMessage());
+        return null;
+      }
+    }
+  }
+
+  @Override
+  public Connection getConnection() throws SQLException {
+    // No connection
+    return null;
+  }
+
+  @Override
+  public void initDB() {
+    // Init through Map
+    try {
+      XMLLimitDAO dao = new XMLLimitDAO(path);
+      dao.deleteAll();
+      dao.insert(new Limit("server1", 1, 2, 3, 4, 5,
+                                UpdatedInfo.valueOf(1)));
+      dao.insert(new Limit("server2", 2, 3, 2, 2, 2,
+                                UpdatedInfo.valueOf(0)));
+      dao.insert(new Limit("server3", 5, 6, 3, 4, 3,
+                                UpdatedInfo.valueOf(0)));
+    } catch (DAOConnectionException e) {
+      e.printStackTrace();
+    }
+    try {
+      XMLBusinessDAO dao = new XMLBusinessDAO(path);
+      dao.deleteAll();
+    } catch (DAOConnectionException e) {
+      e.printStackTrace();
+    }
+    /*
+    INSERT INTO hostconfig VALUES ('joyaux', 'marchand', 'le borgne', 'misc', 1, 'server1');
+    INSERT INTO hostconfig VALUES ('ba', '', '', '<root><version>3.0.9</version></root>', 0, 'server2');
+    INSERT INTO hostconfig VALUES ('ba', '', '', '<root><version>3.0.9</version></root>', 0, 'server3');
+    INSERT INTO hostconfig VALUES ('', '', '', '<root><version>3.0.9</version></root>', 0, 'server4');
+    INSERT INTO hostconfig VALUES ('', '', '', '<root><version>3.0.9</version></root>', 0, 'server5');
+*/
+
+    try {
+      XMLHostDAO dao = new XMLHostDAO(path);
+      dao.deleteAll();
+      dao.insert(new Host("server1", "127.0.0.1", 6666,
+                          "303465626439323336346235616136306332396630346461353132616361346265303639646336633661383432653235".getBytes(),
+                          true,false, true,
+                          false,true,
+                          UpdatedInfo.valueOf(3)));
+      dao.insert(new Host("server1-ssl", "127.0.0.1", 6666,
+                          "303465626439323336346235616136306332396630346461353132616361346265303639646336633661383432653235".getBytes(),
+                          true,false, false,
+                          true,false,
+                          UpdatedInfo.valueOf(0)));
+      dao.insert(new Host("server2", "127.0.0.1", 6666,
+                          "303465626439323336346235616136306332396630346461353132616361346265303639646336633661383432653235".getBytes(),
+                          false,false, false,
+                          true,false,
+                          UpdatedInfo.valueOf(0)));
+    } catch (DAOConnectionException e) {
+      e.printStackTrace();
+    }
+
+    try {
+      XMLRuleDAO dao = new XMLRuleDAO(path);
+      dao.deleteAll();
+    } catch (DAOConnectionException e) {
+      e.printStackTrace();
+    }
+    /*
+    INSERT INTO rules VALUES ('<hostids></hostids>', 1, '/in', '/out', '/arch', '/work', '<tasks></tasks>', '<tasks></tasks>', '<tasks></tasks>', '<tasks></tasks>', '<tasks></tasks>', '<tasks></tasks>', 0, 'default');
+    INSERT INTO rules VALUES ('<hostids><hostid>blabla</hostid><hostid>blabla2</hostid><hostid>blabla3</hostid></hostids>', 1, '/in', '/out', '/arch', '/work', '<tasks></tasks>', '<tasks><task><type>test</type><path>aa</path><delay>1</delay></task></tasks>', '<tasks><task><type>test</type><path>aa</path><delay>1</delay></task><task><type>test</type><path>aa</path><delay>1</delay></task></tasks>', '<tasks><task><type>test</type><path>aa</path><delay>1</delay></task><task><type>test</type><path>aa</path><delay>1</delay></task><task><type>test</type><path>aa</path><delay>1</delay></task></tasks>', '<tasks></tasks>', '<tasks></tasks>', 42, 'dummy');
+    INSERT INTO rules VALUES ('<hostids></hostids>', 3, '/in', '/out', '/arch', '/work', '<tasks></tasks>', '<tasks></tasks>', '<tasks></tasks>', '<tasks></tasks>', '<tasks></tasks>', '<tasks></tasks>', 0, 'dummy2');
+    */
+
+    try {
+      XMLTransferDAO dao = new XMLTransferDAO(path);
+      dao.deleteAll();
+    } catch (DAOConnectionException e) {
+      e.printStackTrace();
+    }
+    /*
+    INSERT INTO runner VALUES (5, 0, 0, 0, 'C  ', true, 'data/server1/log/client.log', false, 'default', 65536, 'data/server1/log/client.log', 'noinfo', '{"ORIGINALSIZE":18391}', 1, '2018-06-27 14:31:37.738', '2018-06-27 14:31:58.042', 'C  ', 5, 'server1', 'server1', 'server2', -9223372036854775807);
+    INSERT INTO runner VALUES (5, 0, 0, 0, 'C  ', true, 'data/server1/log/client.log', false, 'default', 65536, 'data/server1/log/client.log', 'noinfo', '{"ORIGINALSIZE":52587}', 1, '2018-06-20 14:36:00.116', '2018-06-20 14:36:20.374', 'C  ', 4, 'server1', 'server1', 'server2', -9223372036854775806);
+    INSERT INTO runner VALUES (5, 0, 0, 0, 'C  ', true, 'tintin', false, 'tintin', 65536, 'tintin', 'noinfo', '{"ORIGINALSIZE":-1}', 1, '2018-06-22 14:39:01.28', '2018-06-22 14:39:21.518', 'C  ', 4, 'server1', 'server1', 'server2', -9223372036854775805);
+    INSERT INTO runner VALUES (5, 0, 0, 0, 'C  ', true, 'tintin', false, 'default', 65536, 'tintin', 'noinfo', '{"ORIGINALSIZE":-1}', 1, '2018-06-24 14:39:01.28', '2018-06-24 14:39:21.518', 'C  ', 4, 'server1', 'server1', 'server2', 0);
+*/
+
+  }
+
+  @Override
+  public void cleanDB() {
+    // No Clean
+  }
+
+  @Override
+  public TransferDAO getDAO(Connection con) throws DAOConnectionException {
+    return new XMLTransferDAO(path);
+  }
+
+}
diff --git a/src/test/java/org/waarp/openr66/protocol/http/rest/test/HttpTestR66PseudoMain.java b/src/test/java/org/waarp/openr66/protocol/http/rest/test/HttpTestR66PseudoMain.java
index fb6c8cd48..4c1b90a1e 100644
--- a/src/test/java/org/waarp/openr66/protocol/http/rest/test/HttpTestR66PseudoMain.java
+++ b/src/test/java/org/waarp/openr66/protocol/http/rest/test/HttpTestR66PseudoMain.java
@@ -92,7 +92,7 @@ public static RestConfiguration getTestConfiguration()
       configuration.RESTHANDLERS_CRUD[i] = RestConfiguration.CRUD.ALL.mask;
     }
     configuration.REST_AUTHENTICATED = true;
-    configuration.initializeKey(new File("/opt/R66/certs/key.sha256"));
+    configuration.initializeKey(new File(HttpTestRestR66Client.keydesfilename));
     configuration.REST_TIME_LIMIT = 10000;
     configuration.REST_SIGNATURE = true;
     configuration.REST_ADDRESS = "127.0.0.1";
diff --git a/src/test/java/org/waarp/openr66/protocol/http/rest/test/HttpTestRestR66Client.java b/src/test/java/org/waarp/openr66/protocol/http/rest/test/HttpTestRestR66Client.java
index eacce413d..148ef4eb0 100644
--- a/src/test/java/org/waarp/openr66/protocol/http/rest/test/HttpTestRestR66Client.java
+++ b/src/test/java/org/waarp/openr66/protocol/http/rest/test/HttpTestRestR66Client.java
@@ -24,6 +24,7 @@
 import io.netty.handler.codec.http.HttpMethod;
 import org.joda.time.DateTime;
 import org.waarp.common.crypto.Des;
+import org.waarp.common.crypto.HmacSha256;
 import org.waarp.common.crypto.ssl.WaarpSslUtility;
 import org.waarp.common.database.data.AbstractDbData;
 import org.waarp.common.database.exception.WaarpDatabaseException;
@@ -83,6 +84,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 /**
  * @author "Frederic Bregier"
@@ -90,11 +92,11 @@
 public class HttpTestRestR66Client implements Runnable {
   public static String keydesfilename = "/opt/R66/certs/test-key.des";
   private static final String baseURI = "/";
-  private static final String userAuthent = "admin2";
-  private static final String keyAuthent = "test";
+  public static String userAuthent = "admin2";
+  private static String keyAuthent = "test";
   private static final long limit = 10000000;
   private static final long delaylimit = 5000;
-  private static final String hostid = "hostZZ";
+  private static String hostid = "hostZZ";
   private static final String address = "10.10.10.10";
   private static final String hostkey = "ABCDEFGH";
   private static final String business =
@@ -147,7 +149,7 @@ public static void main(String[] args) {
 
     try {
       HttpTestR66PseudoMain.config =
-          HttpTestR66PseudoMain.getTestConfiguration2();
+          HttpTestR66PseudoMain.getTestConfiguration();
     } catch (CryptoException e2) {
       // TODO Auto-generated catch block
       e2.printStackTrace();
diff --git a/src/test/java/org/waarp/openr66/protocol/junit/AllTasksTest.java b/src/test/java/org/waarp/openr66/protocol/junit/AllTasksTest.java
index 70348e0f4..78fefdc5d 100644
--- a/src/test/java/org/waarp/openr66/protocol/junit/AllTasksTest.java
+++ b/src/test/java/org/waarp/openr66/protocol/junit/AllTasksTest.java
@@ -49,7 +49,7 @@ public static void setUpBeforeClass() throws Exception {
     }
 
     @Test
-    public void test2_Tasks() throws IOException, OpenR66RunnerErrorException,
+    public void test_Tasks() throws IOException, OpenR66RunnerErrorException,
                                      CommandAbstractException {
         System.err.println("Start Tasks");
         File totest = new File("/tmp/R66/in/testTask.txt");
diff --git a/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientTest.java b/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientTest.java
index 09c735337..d5bc6f5b4 100644
--- a/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientTest.java
+++ b/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientTest.java
@@ -1,22 +1,22 @@
-/*******************************************************************************
+/**
  * This file is part of Waarp Project (named also Waarp or GG).
- *
- *  Copyright (c) 2019, Waarp SAS, and individual contributors by the @author
- *  tags. See the COPYRIGHT.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  All Waarp Project is free software: you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or (at your
- *  option) any later version.
- *
- *  Waarp is distributed in the hope that it will be useful, but WITHOUT ANY
- *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- *  A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with
- *  Waarp . If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
+ * <p>
+ * Copyright (c) 2019, Waarp SAS, and individual contributors by the @author
+ * tags. See the COPYRIGHT.txt in the distribution for a full listing of
+ * individual contributors.
+ * <p>
+ * All Waarp Project is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * <p>
+ * Waarp is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with
+ * Waarp . If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /**
  *
@@ -125,7 +125,7 @@ public static void setUpBeforeClass() throws Exception {
     // setUpBeforeClassServer("Linux/config/config-serverInitB.xml", "config-serverB.xml", false);
     setUpBeforeClassServer("Linux/config/config-serverInitA.xml",
                            "config-serverA-minimal.xml", true);
-    setUpBeforeClassClient("config-clientB.xml");
+    setUpBeforeClassClient("config-clientA.xml");
   }
 
   /**
@@ -181,8 +181,9 @@ private static void sendInformation(AbstractLocalPacket informationPacket,
                                       R66FiniteDualStates state,
                                       boolean isSsl)
       throws OpenR66ProtocolPacketException {
-    logger.warn("Start connection for Extra commands {}",
-                informationPacket.getClass().getSimpleName());
+    logger.warn("Start connection for Extra commands {} \n\t{}",
+                informationPacket.getClass().getSimpleName(),
+                informationPacket);
     LocalChannelReference localChannelReference = networkTransaction
         .createConnectionWithRetry(socketServerAddress,
                                    isSsl, future);
@@ -290,12 +291,12 @@ public void test1_PingPongPacket() throws WaarpDatabaseException {
   }
 
   @Test
-  public void test8_BusinessRequest() throws WaarpDatabaseException {
+  public void test83_BusinessRequest() throws WaarpDatabaseException {
     logger.warn("Start Test of BusinessRequest");
     DbHostAuth host =
         new DbHostAuth("hostas");
     assertEquals("Error should be at 0", 0,
-                 TestBusinessRequest.runTest(networkTransaction, host, 5));
+                 TestBusinessRequest.runTest(networkTransaction, host, 3));
   }
 
   @Test
@@ -494,6 +495,7 @@ public void test6_SendUsingTrafficShaping() throws IOException {
     R66Result result = future.getResult();
     checkFinalResult(future, result, delay, size);
     totestBig.delete();
+    bandwidth = 0;
   }
 
   @Test
@@ -670,19 +672,18 @@ public void test1_JsonGenerator() {
       assertFalse("Json should not be empty", tasks.isEmpty());
     } catch (WaarpDatabaseNoConnectionException e) {
       e.printStackTrace();
-      assertEquals("Json in Error", true, false);
+      fail("Json in Error");
     } catch (WaarpDatabaseSqlException e) {
       e.printStackTrace();
-      assertEquals("Json in Error", true, false);
+      fail("Json in Error");
     } catch (OpenR66ProtocolBusinessException e) {
       e.printStackTrace();
-      assertEquals("Json in Error", true, false);
+      fail("Json in Error");
     }
   }
 
   @Test
   public void test1_JsonGeneratorDbHostAuth() {
-    // FIXME SHOULD BE POSSIBLE !!
     int nb = 11;
     logger.warn("Start Test Json");
     DbPreparedStatement preparedStatement;
@@ -708,7 +709,6 @@ public void test1_JsonGeneratorDbHostAuth() {
 
   @Test
   public void test1_JsonGeneratorDbRule() {
-    // FIXME SHOULD BE POSSIBLE !!
     int nb = 11;
     logger.warn("Start Test Json");
     DbPreparedStatement preparedStatement;
@@ -733,10 +733,10 @@ public void test1_JsonGeneratorDbRule() {
   }
 
   @Test
-  public void test9_ExtraCommands()
-      throws WaarpDatabaseException, IOException, InterruptedException,
-             OpenR66ProtocolPacketException {
+  public void test91_ExtraCommandsInformationPacket()
+      throws Exception {
     File totest = generateOutFile("/tmp/R66/out/testTask.txt", 10);
+    setUpBeforeClassClient("config-clientB.xml");
     DbHostAuth host =
         new DbHostAuth("hostas");
     final SocketAddress socketServerAddress;
@@ -770,6 +770,7 @@ public void test9_ExtraCommands()
                     false, R66FiniteDualStates.INFORMATION,
                     true);
 
+    logger.warn("Start Extra commands: ASKEXIST");
     future = new R66Future(true);
     scode = (byte) InformationPacket.ASKENUM.ASKEXIST.ordinal();
     informationPacket =
@@ -778,6 +779,7 @@ public void test9_ExtraCommands()
                     true, R66FiniteDualStates.INFORMATION,
                     true);
 
+    logger.warn("Start Extra commands: ASKLIST");
     future = new R66Future(true);
     scode = (byte) InformationPacket.ASKENUM.ASKLIST.ordinal();
     informationPacket =
@@ -786,6 +788,7 @@ public void test9_ExtraCommands()
                     true, R66FiniteDualStates.INFORMATION,
                     true);
 
+    logger.warn("Start Extra commands: ASKMLSDETAIL");
     future = new R66Future(true);
     scode = (byte) InformationPacket.ASKENUM.ASKMLSDETAIL.ordinal();
     informationPacket =
@@ -794,6 +797,7 @@ public void test9_ExtraCommands()
                     true, R66FiniteDualStates.INFORMATION,
                     true);
 
+    logger.warn("Start Extra commands: ASKMLSLIST");
     future = new R66Future(true);
     scode = (byte) InformationPacket.ASKENUM.ASKMLSLIST.ordinal();
     informationPacket =
@@ -803,35 +807,57 @@ public void test9_ExtraCommands()
                     true);
 
     // ValidPacket BANDWIDTH
+    logger.warn("Start Extra commands: BANDWIDTHPACKET)");
     future = new R66Future(true);
     ValidPacket valid =
         new ValidPacket("-1", "-1", LocalPacketFactory.BANDWIDTHPACKET);
     sendInformation(valid, socketServerAddress, future, scode, true,
                     R66FiniteDualStates.VALIDOTHER, true);
 
-    // MultipleDirectTransfer
-    logger.warn("Start MultipleDirectTransfer");
-    future = new R66Future(true);
-    MultipleDirectTransfer multipleDirectTransfer =
-        new MultipleDirectTransfer(future, "hostas,hostas",
-                                   "testTask.txt,testTask.txt", "rule3",
-                                   "MultipleDirectTransfer", true, 1024,
-                                   DbConstant.ILLEGALVALUE,
-                                   networkTransaction);
-    multipleDirectTransfer.run();
-    future.awaitForDoneOrInterruptible();
-    assertTrue("All sends should be OK", future.isSuccess());
+    setUpBeforeClassClient("config-clientA.xml");
+    totest.delete();
+  }
+
+  @Test
+  public void test93_ExtraCommandsOnTransfer()
+      throws Exception {
+    setUpBeforeClassClient("config-clientB.xml");
+    ValidPacket valid;
+    byte scode = -1;
+    File totest = generateOutFile("/tmp/R66/out/testTask.txt", 10);
+    DbHostAuth host =
+        new DbHostAuth("hostas");
+    final SocketAddress socketServerAddress;
+    try {
+      socketServerAddress = host.getSocketAddress();
+    } catch (IllegalArgumentException e) {
+      logger.error(
+          "Needs a correct configuration file as first argument");
+      return;
+    }
+    R66Future futureTransfer = new R66Future(true);
+    TestTransferNoDb transaction =
+        new TestTransferNoDb(futureTransfer, "hostas", "testTask.txt",
+                             "rule3",
+                             "Test SendDirect Small", true, 8192,
+                             DbConstant.ILLEGALVALUE,
+                             networkTransaction);
+    transaction.run();
+    futureTransfer.await();
+    assertTrue("File transfer not ok", futureTransfer.isSuccess());
+    long id = futureTransfer.getRunner().getSpecialId();
+    logger.warn("Remote Task: {}", id);
 
     // RequestTransfer
     logger.warn("Start RequestTransfer check");
-    future = new R66Future(true);
+    R66Future future = new R66Future(true);
     RequestTransfer requestTransfer =
-        new RequestTransfer(future, id, "hostas", "hostas", false,
+        new RequestTransfer(future, id, "hostbs", "hostbs", false,
                             false, false,
                             networkTransaction);
     requestTransfer.run();
     future.awaitForDoneOrInterruptible();
-    assertFalse("Request of Transfer should be OK", future.isSuccess());
+    assertTrue("Request of Transfer should be OK", future.isSuccess());
 
     // RequestTransfer
     logger.warn("Start RequestTransfer stop");
@@ -864,6 +890,53 @@ public void test9_ExtraCommands()
     future.awaitForDoneOrInterruptible();
     assertTrue("Request of information should be OK", future.isSuccess());
 
+
+    // ValidPacket VALID
+    logger.warn("Start Valid VALID");
+    future = new R66Future(true);
+    valid = new ValidPacket(null, "hostas hostas " + id,
+                            LocalPacketFactory.VALIDPACKET);
+    sendInformation(valid, socketServerAddress, future, scode, false,
+                    R66FiniteDualStates.VALIDOTHER, true);
+
+    // ValidPacket STOP
+    logger.warn("Start Valid STOP");
+    future = new R66Future(true);
+    valid = new ValidPacket(null, "hostas hostas " + id,
+                            LocalPacketFactory.STOPPACKET);
+    sendInformation(valid, socketServerAddress, future, scode, true,
+                    R66FiniteDualStates.VALIDOTHER, true);
+
+    // ValidPacket CANCEL
+    logger.warn("Start Valid CANCEL");
+    future = new R66Future(true);
+    valid = new ValidPacket(null, "hostas hostas " + id,
+                            LocalPacketFactory.CANCELPACKET);
+    sendInformation(valid, socketServerAddress, future, scode, true,
+                    R66FiniteDualStates.VALIDOTHER, true);
+
+    setUpBeforeClassClient("config-clientA.xml");
+    totest.delete();
+  }
+
+  @Test
+  public void test92_ExtraCommandsOther()
+      throws Exception {
+    setUpBeforeClassClient("config-clientB.xml");
+    ValidPacket valid;
+    byte scode = -1;
+    DbHostAuth host =
+        new DbHostAuth("hostas");
+    final SocketAddress socketServerAddress;
+    try {
+      socketServerAddress = host.getSocketAddress();
+    } catch (IllegalArgumentException e) {
+      logger.error(
+          "Needs a correct configuration file as first argument");
+      return;
+    }
+    R66Future future;
+
     // Message
     logger.warn("Start Message");
     future = new R66Future(true);
@@ -918,30 +991,6 @@ public void test9_ExtraCommands()
     sendInformation(valid, socketServerAddress, future, scode, false,
                     R66FiniteDualStates.VALIDOTHER, true);
 
-    // ValidPacket VALID
-    logger.warn("Start Valid VALID");
-    future = new R66Future(true);
-    valid = new ValidPacket(null, "hostas hostas " + id,
-                            LocalPacketFactory.VALIDPACKET);
-    sendInformation(valid, socketServerAddress, future, scode, false,
-                    R66FiniteDualStates.VALIDOTHER, true);
-
-    // ValidPacket STOP
-    logger.warn("Start Valid STOP");
-    future = new R66Future(true);
-    valid = new ValidPacket(null, "hostas hostas " + id,
-                            LocalPacketFactory.STOPPACKET);
-    sendInformation(valid, socketServerAddress, future, scode, true,
-                    R66FiniteDualStates.VALIDOTHER, true);
-
-    // ValidPacket CANCEL
-    logger.warn("Start Valid CANCEL");
-    future = new R66Future(true);
-    valid = new ValidPacket(null, "hostas hostas " + id,
-                            LocalPacketFactory.CANCELPACKET);
-    sendInformation(valid, socketServerAddress, future, scode, true,
-                    R66FiniteDualStates.VALIDOTHER, true);
-
     // NoOpPacket
     logger.warn("Start NoOp");
     long timeout = Configuration.configuration.getTIMEOUTCON();
@@ -960,12 +1009,12 @@ public void test9_ExtraCommands()
                     true);
     Configuration.configuration.setTIMEOUTCON(timeout);
 
-    totest.delete();
+    setUpBeforeClassClient("config-clientA.xml");
   }
 
   @Test
-  public void test8_JsonCommands()
-      throws IOException, WaarpDatabaseException, InterruptedException,
+  public void test91_MultipleDirectTransfer()
+      throws WaarpDatabaseException, IOException, InterruptedException,
              OpenR66ProtocolPacketException {
     File totest = generateOutFile("/tmp/R66/out/testTask.txt", 10);
     DbHostAuth host =
@@ -988,9 +1037,75 @@ public void test8_JsonCommands()
     transaction.run();
     futureTransfer.await();
     assertTrue("File transfer not ok", futureTransfer.isSuccess());
-    long id = futureTransfer.getResult().getRunner().getSpecialId();
-    logger.warn("Remote Task: {}",
-                futureTransfer.getResult().getRunner().getSpecialId());
+    long id = futureTransfer.getRunner().getSpecialId();
+    logger.warn("Remote Task: {}", id);
+
+    // MultipleDirectTransfer
+    logger.warn("Start MultipleDirectTransfer");
+    R66Future future = new R66Future(true);
+    MultipleDirectTransfer multipleDirectTransfer =
+        new MultipleDirectTransfer(future, "hostas,hostas",
+                                   "testTask.txt,testTask.txt", "rule3",
+                                   "MultipleDirectTransfer", true, 1024,
+                                   DbConstant.ILLEGALVALUE,
+                                   networkTransaction);
+    multipleDirectTransfer.run();
+    future.awaitForDoneOrInterruptible();
+    assertTrue("All sends should be OK", future.isSuccess());
+
+    totest.delete();
+  }
+
+
+  @Test
+  public void test81_JsonCommandsLogs()
+      throws IOException, WaarpDatabaseException, InterruptedException,
+             OpenR66ProtocolPacketException {
+    DbHostAuth host =
+        new DbHostAuth("hosta");
+    final SocketAddress socketServerAddress;
+    try {
+      socketServerAddress = host.getSocketAddress();
+    } catch (IllegalArgumentException e) {
+      logger.error(
+          "Needs a correct configuration file as first argument");
+      return;
+    }
+
+    byte scode = -1;
+    AbstractLocalPacket valid = null;
+
+    logger.warn("Log");
+    R66Future future = new R66Future(true);
+    LogJsonPacket node6 = new LogJsonPacket();
+    node6.setClean(true);
+    node6.setPurge(false);
+    valid = new JsonCommandPacket(node6, LocalPacketFactory.LOGPACKET);
+    sendInformation(valid, socketServerAddress, future, scode, true,
+                    R66FiniteDualStates.VALIDOTHER, false);
+    logger.warn("Log2");
+    future = new R66Future(true);
+    node6.setPurge(true);
+    valid = new JsonCommandPacket(node6, LocalPacketFactory.LOGPURGEPACKET);
+    sendInformation(valid, socketServerAddress, future, scode, true,
+                    R66FiniteDualStates.VALIDOTHER, false);
+
+  }
+
+  @Test
+  public void test82_JsonCommandsOthers()
+      throws IOException, WaarpDatabaseException, InterruptedException,
+             OpenR66ProtocolPacketException {
+    DbHostAuth host =
+        new DbHostAuth("hosta");
+    final SocketAddress socketServerAddress;
+    try {
+      socketServerAddress = host.getSocketAddress();
+    } catch (IllegalArgumentException e) {
+      logger.error(
+          "Needs a correct configuration file as first argument");
+      return;
+    }
 
     byte scode = -1;
 
@@ -1009,65 +1124,15 @@ public void test8_JsonCommands()
     node = new BandwidthJsonPacket();
     // will ask current values instead
     node.setSetter(true);
-    node.setWriteglobal(0);
-    node.setReadglobal(0);
-    node.setWritesession(0);
-    node.setReadsession(0);
+    node.setWriteglobal(1000000000);
+    node.setReadglobal(1000000000);
+    node.setWritesession(1000000000);
+    node.setReadsession(1000000000);
     valid = new JsonCommandPacket(node, LocalPacketFactory.BANDWIDTHPACKET);
     sendInformation(valid, socketServerAddress, future, scode, true,
                     R66FiniteDualStates.VALIDOTHER, false);
 
-    logger.warn("Information");
-    future = new R66Future(true);
-    InformationJsonPacket node4 =
-        new InformationJsonPacket(id, true, "hostas");
-    valid = new JsonCommandPacket(node4,
-                                  LocalPacketFactory.INFORMATIONPACKET);
-    sendInformation(valid, socketServerAddress, future, scode, true,
-                    R66FiniteDualStates.VALIDOTHER, false);
-
-    logger.warn("Information2");
-    future = new R66Future(true);
-    node4 = new InformationJsonPacket(
-        (byte) InformationPacket.ASKENUM.ASKMLSDETAIL.ordinal(),
-        "rule3",
-        "testTask.txt");
-    valid = new JsonCommandPacket(node4,
-                                  LocalPacketFactory.INFORMATIONPACKET);
-    sendInformation(valid, socketServerAddress, future, scode, true,
-                    R66FiniteDualStates.VALIDOTHER, false);
-
-    logger.warn("Stop");
-    future = new R66Future(true);
-    StopOrCancelJsonPacket node5 = new StopOrCancelJsonPacket();
-    node5.setRequested("hostas");
-    node5.setRequester("hostas");
-    node5.setSpecialid(id);
-    valid = new JsonCommandPacket(node5, LocalPacketFactory.STOPPACKET);
-    sendInformation(valid, socketServerAddress, future, scode, true,
-                    R66FiniteDualStates.VALIDOTHER, false);
-    logger.warn("Cancel");
-    future = new R66Future(true);
-    valid = new JsonCommandPacket(node5, LocalPacketFactory.CANCELPACKET);
-    sendInformation(valid, socketServerAddress, future, scode, true,
-                    R66FiniteDualStates.VALIDOTHER, false);
-
-    logger.warn("Log");
-    future = new R66Future(true);
-    LogJsonPacket node6 = new LogJsonPacket();
-    node6.setClean(true);
-    node6.setPurge(false);
-    valid = new JsonCommandPacket(node6, LocalPacketFactory.LOGPACKET);
-    sendInformation(valid, socketServerAddress, future, scode, true,
-                    R66FiniteDualStates.VALIDOTHER, false);
-    logger.warn("Log2");
-    future = new R66Future(true);
-    node6.setPurge(true);
-    valid = new JsonCommandPacket(node6, LocalPacketFactory.LOGPURGEPACKET);
-    sendInformation(valid, socketServerAddress, future, scode, true,
-                    R66FiniteDualStates.VALIDOTHER, false);
-
-    logger.warn("Config");
+    logger.warn("Config Export");
     future = new R66Future(true);
     ConfigExportJsonPacket node7 = new ConfigExportJsonPacket();
     node7.setHost(true);
@@ -1083,19 +1148,23 @@ public void test8_JsonCommands()
     logger.warn("Config Import");
     future = new R66Future(true);
     ConfigImportJsonPacket node8 = new ConfigImportJsonPacket();
-    node8.setHost("/tmp/R66/arch/hostb_Authentications.xml");
-    node8.setRule("/tmp/R66/arch/hostb.rules.xml");
+    node8.setHost("/tmp/R66/arch/hosta_Authentications.xml");
+    node8.setRule("/tmp/R66/arch/hosta.rules.xml");
     valid = new JsonCommandPacket(node8,
                                   LocalPacketFactory.CONFIMPORTPACKET);
     sendInformation(valid, socketServerAddress, future, scode, true,
                     R66FiniteDualStates.VALIDOTHER, false);
 
-    logger.warn("Test");
+    logger.warn("BandwidthUnlimit 2");
     future = new R66Future(true);
-    JsonPacket node9 = new JsonPacket();
-    node9.setComment("Test Message");
-    node9.setRequestUserPacket(LocalPacketFactory.TESTPACKET);
-    valid = new JsonCommandPacket(node9, LocalPacketFactory.TESTPACKET);
+    node = new BandwidthJsonPacket();
+    // will ask current values instead
+    node.setSetter(true);
+    node.setWriteglobal(1000000000);
+    node.setReadglobal(1000000000);
+    node.setWritesession(1000000000);
+    node.setReadsession(1000000000);
+    valid = new JsonCommandPacket(node, LocalPacketFactory.BANDWIDTHPACKET);
     sendInformation(valid, socketServerAddress, future, scode, true,
                     R66FiniteDualStates.VALIDOTHER, false);
 
@@ -1111,8 +1180,28 @@ public void test8_JsonCommands()
     sendInformation(valid, socketServerAddress, future, scode, true,
                     R66FiniteDualStates.VALIDOTHER, false);
 
+  }
+
+  @Ignore("Information not OK at the end")
+  @Test
+  public void test80_JsonCommandsBusiness()
+      throws IOException, WaarpDatabaseException, InterruptedException,
+             OpenR66ProtocolPacketException {
+    DbHostAuth host =
+        new DbHostAuth("hosta");
+    final SocketAddress socketServerAddress;
+    try {
+      socketServerAddress = host.getSocketAddress();
+    } catch (IllegalArgumentException e) {
+      logger.error(
+          "Needs a correct configuration file as first argument");
+      return;
+    }
+
+    byte scode = -1;
     logger.warn("Business");
-    future = new R66Future(true);
+    R66Future future = new R66Future(true);
+    AbstractLocalPacket valid = null;
     BusinessRequestJsonPacket node3 = new BusinessRequestJsonPacket();
     node3.setClassName(TestExecJavaTask.class.getName());
     node3.setArguments(" business 0");
@@ -1123,6 +1212,107 @@ public void test8_JsonCommands()
     sendInformation(valid, socketServerAddress, future, scode, true,
                     R66FiniteDualStates.VALIDOTHER, false);
 
+  }
+
+  @Ignore("Information not OK at the end")
+  @Test
+  public void test80_JsonCommandsTest()
+      throws IOException, WaarpDatabaseException, InterruptedException,
+             OpenR66ProtocolPacketException {
+    DbHostAuth host =
+        new DbHostAuth("hosta");
+    final SocketAddress socketServerAddress;
+    try {
+      socketServerAddress = host.getSocketAddress();
+    } catch (IllegalArgumentException e) {
+      logger.error(
+          "Needs a correct configuration file as first argument");
+      return;
+    }
+
+    byte scode = -1;
+    logger.warn("Test");
+    R66Future future = new R66Future(true);
+    AbstractLocalPacket valid = null;
+    JsonPacket node9 = new JsonPacket();
+    node9.setComment("Test Message");
+    node9.setRequestUserPacket(LocalPacketFactory.TESTPACKET);
+    valid = new JsonCommandPacket(node9, LocalPacketFactory.TESTPACKET);
+    sendInformation(valid, socketServerAddress, future, scode, true,
+                    R66FiniteDualStates.VALIDOTHER, false);
+
+    logger.warn("End Json");
+  }
+
+  @Test
+  public void test81_JsonCommandsWithTransferId()
+      throws IOException, WaarpDatabaseException, InterruptedException,
+             OpenR66ProtocolPacketException {
+    File totest = generateOutFile("/tmp/R66/out/testTask.txt", 10);
+    DbHostAuth host =
+        new DbHostAuth("hostas");
+    final SocketAddress socketServerAddress;
+    try {
+      socketServerAddress = host.getSocketAddress();
+    } catch (IllegalArgumentException e) {
+      logger.error(
+          "Needs a correct configuration file as first argument");
+      return;
+    }
+    R66Future futureTransfer = new R66Future(true);
+    TestTransferNoDb transaction =
+        new TestTransferNoDb(futureTransfer, "hostas", "testTask.txt",
+                             "rule3",
+                             "Test SendDirect Small", true, 8192,
+                             DbConstant.ILLEGALVALUE,
+                             networkTransaction);
+    transaction.run();
+    futureTransfer.await();
+    assertTrue("File transfer not ok", futureTransfer.isSuccess());
+    long id = futureTransfer.getResult().getRunner().getSpecialId();
+    logger.warn("Remote Task: {}",
+                futureTransfer.getResult().getRunner().getSpecialId());
+
+    byte scode = -1;
+
+    R66Future future;
+    AbstractLocalPacket valid;
+
+    logger.warn("Information");
+    future = new R66Future(true);
+    InformationJsonPacket node4 =
+        new InformationJsonPacket(id, true, "hostas");
+    valid = new JsonCommandPacket(node4,
+                                  LocalPacketFactory.INFORMATIONPACKET);
+    sendInformation(valid, socketServerAddress, future, scode, true,
+                    R66FiniteDualStates.VALIDOTHER, true);
+
+    logger.warn("Information2");
+    future = new R66Future(true);
+    node4 = new InformationJsonPacket(
+        (byte) InformationPacket.ASKENUM.ASKMLSDETAIL.ordinal(),
+        "rule3",
+        "testTask.txt");
+    valid = new JsonCommandPacket(node4,
+                                  LocalPacketFactory.INFORMATIONPACKET);
+    sendInformation(valid, socketServerAddress, future, scode, true,
+                    R66FiniteDualStates.VALIDOTHER, true);
+
+    logger.warn("Stop");
+    future = new R66Future(true);
+    StopOrCancelJsonPacket node5 = new StopOrCancelJsonPacket();
+    node5.setRequested("hostas");
+    node5.setRequester("hostas");
+    node5.setSpecialid(id);
+    valid = new JsonCommandPacket(node5, LocalPacketFactory.STOPPACKET);
+    sendInformation(valid, socketServerAddress, future, scode, true,
+                    R66FiniteDualStates.VALIDOTHER, true);
+    logger.warn("Cancel");
+    future = new R66Future(true);
+    valid = new JsonCommandPacket(node5, LocalPacketFactory.CANCELPACKET);
+    sendInformation(valid, socketServerAddress, future, scode, true,
+                    R66FiniteDualStates.VALIDOTHER, true);
+
     logger.warn("End Json");
     totest.delete();
   }
@@ -1131,7 +1321,7 @@ public void test8_JsonCommands()
   public void test1_ThriftClient() throws IOException {
     logger.warn("Start Test Thrift Client");
     int PORT = 4266;
-    int tries = 10000;
+    int tries = 1000;
     TTransport transport = null;
     try {
       File totest = generateOutFile("/tmp/R66/out/testTask.txt", 10);
@@ -1229,10 +1419,12 @@ public void test1_ThriftClient() throws IOException {
     transport.close();
   }
 
+  @Ignore("Issue on checkBaseAuthent")
   @Test
-  public void test9_RestR66() throws Exception {
+  public void test90_RestR66() throws Exception {
     HttpTestRestR66Client.keydesfilename =
         new File(dir, "certs/test-key.des").getAbsolutePath();
+    logger.info("Key filename: {}", HttpTestRestR66Client.keydesfilename);
     HttpTestRestR66Client.main(new String[] { "1" });
   }
 }
diff --git a/src/test/java/org/waarp/openr66/protocol/junit/TestAbstract.java b/src/test/java/org/waarp/openr66/protocol/junit/TestAbstract.java
index 0880851ef..d75e4d095 100644
--- a/src/test/java/org/waarp/openr66/protocol/junit/TestAbstract.java
+++ b/src/test/java/org/waarp/openr66/protocol/junit/TestAbstract.java
@@ -1,22 +1,22 @@
-/*******************************************************************************
+/**
  * This file is part of Waarp Project (named also Waarp or GG).
- *
- *  Copyright (c) 2019, Waarp SAS, and individual contributors by the @author
- *  tags. See the COPYRIGHT.txt in the distribution for a full listing of
- *  individual contributors.
- *
- *  All Waarp Project is free software: you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or (at your
- *  option) any later version.
- *
- *  Waarp is distributed in the hope that it will be useful, but WITHOUT ANY
- *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- *  A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with
- *  Waarp . If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
+ * <p>
+ * Copyright (c) 2019, Waarp SAS, and individual contributors by the @author
+ * tags. See the COPYRIGHT.txt in the distribution for a full listing of
+ * individual contributors.
+ * <p>
+ * All Waarp Project is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * <p>
+ * Waarp is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with
+ * Waarp . If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /**
  *
@@ -30,8 +30,19 @@
 import org.apache.tools.ant.types.Path;
 import org.junit.After;
 import org.junit.Before;
+import org.waarp.common.database.DbPreparedStatement;
+import org.waarp.common.database.data.AbstractDbData.UpdatedInfo;
+import org.waarp.common.database.exception.WaarpDatabaseException;
+import org.waarp.common.database.exception.WaarpDatabaseNoDataException;
 import org.waarp.common.utility.DetectionUtils;
 import org.waarp.openr66.configuration.FileBasedConfiguration;
+import org.waarp.openr66.dao.DAOFactory;
+import org.waarp.openr66.dao.TransferDAO;
+import org.waarp.openr66.dao.exception.DAOConnectionException;
+import org.waarp.openr66.dao.exception.DAONoDataException;
+import org.waarp.openr66.database.data.DbTaskRunner;
+import org.waarp.openr66.database.data.DbTaskRunner.Columns;
+import org.waarp.openr66.database.data.DbTaskRunner.TASKSTEP;
 import org.waarp.openr66.protocol.configuration.Configuration;
 import org.waarp.openr66.protocol.networkhandler.NetworkTransaction;
 import org.waarp.openr66.protocol.utils.ChannelUtils;
@@ -39,6 +50,7 @@
 import org.waarp.openr66.server.ServerInitDatabase;
 
 import java.io.File;
+import java.io.FileFilter;
 
 /**
  * @author frederic
@@ -51,6 +63,7 @@ public abstract class TestAbstract extends TestAbstractMinimal {
   private static File homeDir;
 
   public static void setUpDbBeforeClass() throws Exception {
+    deleteBase();
     String serverInit = "Linux/config/config-serverInitB.xml";
     setUpBeforeClassMinimal(serverInit);
 
@@ -75,38 +88,18 @@ public static void setUpDbBeforeClass() throws Exception {
     listener.setMessageOutputLevel(Project.MSG_WARN);
     project.fireBuildStarted();
 
-    initiateDbB();
-    initiateDbA();
+    serverInit = "config-serverInitB.xml";
+    initiateDb(serverInit);
+    serverInit = "config-serverInitA.xml";
+    initiateDb(serverInit);
 
     project.log("finished");
     project.fireBuildFinished(null);
   }
 
 
-  public static void initiateDbB() {
+  public static void initiateDb(String serverInit) {
     DetectionUtils.setJunit(true);
-    String serverInit = "config-serverInitB.xml";
-    File file = new File(dir, serverInit);
-    logger.warn("File {} exists? {}", file, file.isFile());
-    File fileAuth = new File(dir, "OpenR66-authent-A.xml");
-    File fileLimit = new File(dir, "limitConfiga.xml");
-    logger.warn("File {} exists? {}", fileAuth, fileAuth.isFile());
-    logger.warn("File {} exists? {}", fileLimit, fileLimit.isFile());
-
-    String[] args = {
-        file.getAbsolutePath(), "-initdb", "-dir",
-        dir.getAbsolutePath(), "-auth",
-        new File(dir, "OpenR66-authent-A.xml").getAbsolutePath(),
-        "-limit",
-        new File(dir, "limitConfiga.xml").getAbsolutePath()
-    };
-    executeJvm(homeDir, ServerInitDatabase.class, args);
-  }
-
-  public static void initiateDbA() {
-    DetectionUtils.setJunit(true);
-    String serverInit = "config-serverInitA.xml";
-
     File file = new File(dir, serverInit);
     logger.warn("File {} exists? {}", file, file.isFile());
     File fileAuth = new File(dir, "OpenR66-authent-A.xml");
@@ -201,16 +194,24 @@ public static void setUpBeforeClassServer(String serverInit,
     }
   }
 
-  /**
-   * @throws java.lang.Exception
-   */
   public static void tearDownAfterClassServer() throws Exception {
     ChannelUtils.exit();
+    deleteBase();
+  }
+
+  public static void deleteBase() {
+    File tmp = new File("/tmp");
+    File[] files = tmp.listFiles(new FileFilter() {
+      @Override
+      public boolean accept(File file) {
+        return file.getName().startsWith("openr66");
+      }
+    });
+    for (File file : files) {
+      file.delete();
+    }
   }
 
-  /**
-   * @throws java.lang.Exception
-   */
   public static void setUpBeforeClassClient(String clientConfig)
       throws Exception {
     File clientConfigFile = new File(dir, clientConfig);
@@ -233,26 +234,32 @@ public static void setUpBeforeClassClient(String clientConfig)
     }
     Configuration.configuration.pipelineInit();
     networkTransaction = new NetworkTransaction();
+    DbTaskRunner.clearCache();
+    TransferDAO transferAccess = null;
+    try {
+      transferAccess = DAOFactory.getInstance().getTransferDAO();
+      transferAccess.deleteAll();
+    } catch (DAOConnectionException e) {
+      throw new WaarpDatabaseException(e);
+    } finally {
+      if (transferAccess != null) {
+        transferAccess.close();
+      }
+    }
   }
 
-  /**
-   * @throws java.lang.Exception
-   */
   public static void tearDownAfterClassClient() throws Exception {
     networkTransaction.closeAll();
   }
 
-  /**
-   * @throws java.lang.Exception
-   */
   @Before
   public void setUp() throws Exception {
     Configuration.configuration.setTIMEOUTCON(10000);
+    Configuration.configuration
+        .changeNetworkLimit(1000000000, 1000000000, 1000000000, 1000000000,
+                            1000);
   }
 
-  /**
-   * @throws java.lang.Exception
-   */
   @After
   public void tearDown() throws Exception {
     Configuration.configuration.setTIMEOUTCON(100);
diff --git a/src/test/java/org/waarp/openr66/protocol/junit/TestAbstractMinimal.java b/src/test/java/org/waarp/openr66/protocol/junit/TestAbstractMinimal.java
index fa74b526b..4a690844e 100644
--- a/src/test/java/org/waarp/openr66/protocol/junit/TestAbstractMinimal.java
+++ b/src/test/java/org/waarp/openr66/protocol/junit/TestAbstractMinimal.java
@@ -24,6 +24,7 @@
 package org.waarp.openr66.protocol.junit;
 
 import org.waarp.common.file.FileUtils;
+import org.waarp.common.logging.WaarpLogLevel;
 import org.waarp.common.logging.WaarpLogger;
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.common.logging.WaarpSlf4JLoggerFactory;
@@ -49,7 +50,8 @@ public abstract class TestAbstractMinimal {
      */
     public static void setUpBeforeClassMinimal(String serverInit)
             throws Exception {
-        WaarpLoggerFactory.setDefaultFactory(new WaarpSlf4JLoggerFactory(null));
+        WaarpLoggerFactory.setDefaultFactory(new WaarpSlf4JLoggerFactory(
+            WaarpLogLevel.WARN));
         if (logger == null) {
             logger = WaarpLoggerFactory.getLogger(TestAbstractMinimal.class);
         }
@@ -67,12 +69,6 @@ public static void setUpBeforeClassMinimal(String serverInit)
             new File(tmp, "work").mkdir();
             File conf = new File(tmp, "conf");
             conf.mkdir();
-            File[] files = dir.listFiles(new FileFilter() {
-                @Override
-                public boolean accept(File file) {
-                    return file.isFile();
-                }
-            });
             File [] copied = FileUtils.copyRecursive(dir, conf, false);
             for (File fileCopied : copied) {
                 System.out.print(fileCopied.getAbsolutePath() + " ");
diff --git a/src/test/java/org/waarp/openr66/protocol/test/TestBusinessRequest.java b/src/test/java/org/waarp/openr66/protocol/test/TestBusinessRequest.java
index 0653d759c..53f07120c 100644
--- a/src/test/java/org/waarp/openr66/protocol/test/TestBusinessRequest.java
+++ b/src/test/java/org/waarp/openr66/protocol/test/TestBusinessRequest.java
@@ -19,6 +19,7 @@
  ******************************************************************************/
 package org.waarp.openr66.protocol.test;
 
+import org.waarp.common.logging.WaarpLogLevel;
 import org.waarp.common.logging.WaarpLogger;
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.common.logging.WaarpSlf4JLoggerFactory;
@@ -55,7 +56,7 @@ public TestBusinessRequest(NetworkTransaction networkTransaction,
 
   public static void main(String[] args) {
     WaarpLoggerFactory.setDefaultFactory(new WaarpSlf4JLoggerFactory(
-        null));
+        WaarpLogLevel.WARN));
     if (logger == null) {
       logger = WaarpLoggerFactory.getLogger(TestBusinessRequest.class);
     }
@@ -72,19 +73,19 @@ public static void main(String[] args) {
     }
     Configuration.configuration.pipelineInit();
 
-        NetworkTransaction networkTransaction = new NetworkTransaction();
-        DbHostAuth host = Configuration.configuration.getHOST_AUTH();
-        runTest(networkTransaction, host, 1);
-        networkTransaction.closeAll();
-    }
+    NetworkTransaction networkTransaction = new NetworkTransaction();
+    DbHostAuth host = Configuration.configuration.getHOST_AUTH();
+    runTest(networkTransaction, host, 1);
+    networkTransaction.closeAll();
+  }
 
-    public static int runTest(NetworkTransaction networkTransaction,
-                              DbHostAuth host, int nbToDo) {
-        if (logger == null) {
-            logger = WaarpLoggerFactory.getLogger(TestBusinessRequest.class);
-        }
-        ExecutorService executorService = Executors.newCachedThreadPool();
-        int nb = nbToDo;
+  public static int runTest(NetworkTransaction networkTransaction,
+                            DbHostAuth host, int nbToDo) {
+    if (logger == null) {
+      logger = WaarpLoggerFactory.getLogger(TestBusinessRequest.class);
+    }
+    ExecutorService executorService = Executors.newCachedThreadPool();
+    int nb = nbToDo;
 
     R66Future[] arrayFuture = new R66Future[nb];
     logger.info("Start Test of Transaction");
@@ -154,47 +155,47 @@ public static int runTest(NetworkTransaction networkTransaction,
         "Simple ExecJava Success: " + success + " Error: " + error + " NB/s: " +
         1000 / (time4 - time3));
 
-        logger.info("Start Test of Increasing Transaction");
-        time1 = System.currentTimeMillis();
-        String argsAdd =
-                "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789";
-        String value = " business 0 ";
-        int lastnb = nb;
-        for (int i = 0; i < nb; i++) {
-            arrayFuture[i] = new R66Future(true);
-            try {
-                value += argsAdd + argsAdd + argsAdd + argsAdd + argsAdd +
-                         argsAdd + argsAdd + argsAdd + argsAdd
-                         + argsAdd;
-            } catch (OutOfMemoryError e) {
-                logger.warn("Send size: " + value.length());
-                lastnb = i;
-                break;
-            }
-            packet = new BusinessRequestPacket(
-                    TestExecJavaTask.class.getName() + value, 0);
-            TestBusinessRequest transaction2 =
-                    new TestBusinessRequest(networkTransaction, arrayFuture[i],
-                                            host.getHostid(), packet);
-            executorService.execute(transaction2);
-        }
-        int success2 = 0;
-        int error2 = 0;
-        for (int i = 0; i < lastnb; i++) {
-            arrayFuture[i].awaitForDoneOrInterruptible();
-            if (arrayFuture[i].isSuccess()) {
-                success2++;
-            } else {
-                error2++;
-            }
-        }
-        time2 = System.currentTimeMillis();
-        logger.warn(
-                "Simple TestExecJavaTask with increasing argument size Success: " +
-                success2 + " Error: " + error2
-                + " NB/s: " + success2 * nb * 1000 / (time2 - time1));
-        executorService.shutdown();
-        return error + error2;
+    logger.info("Start Test of Increasing Transaction");
+    time1 = System.currentTimeMillis();
+    String argsAdd =
+        "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789";
+    String value = " business 0 ";
+    int lastnb = nb;
+    for (int i = 0; i < nb; i++) {
+      arrayFuture[i] = new R66Future(true);
+      try {
+        value += argsAdd + argsAdd + argsAdd + argsAdd + argsAdd +
+                 argsAdd + argsAdd + argsAdd + argsAdd
+                 + argsAdd;
+      } catch (OutOfMemoryError e) {
+        logger.warn("Send size: " + value.length());
+        lastnb = i;
+        break;
+      }
+      packet = new BusinessRequestPacket(
+          TestExecJavaTask.class.getName() + value, 0);
+      TestBusinessRequest transaction2 =
+          new TestBusinessRequest(networkTransaction, arrayFuture[i],
+                                  host.getHostid(), packet);
+      executorService.execute(transaction2);
     }
+    int success2 = 0;
+    int error2 = 0;
+    for (int i = 0; i < lastnb; i++) {
+      arrayFuture[i].awaitForDoneOrInterruptible();
+      if (arrayFuture[i].isSuccess()) {
+        success2++;
+      } else {
+        error2++;
+      }
+    }
+    time2 = System.currentTimeMillis();
+    logger.warn(
+        "Simple TestExecJavaTask with increasing argument size Success: " +
+        success2 + " Error: " + error2
+        + " NB/s: " + success2 * nb * 1000 / (time2 - time1));
+    executorService.shutdown();
+    return error + error2;
+  }
 
 }
diff --git a/src/test/java/org/waarp/openr66/protocol/test/TestTasks.java b/src/test/java/org/waarp/openr66/protocol/test/TestTasks.java
index 03efe8843..86ef52921 100644
--- a/src/test/java/org/waarp/openr66/protocol/test/TestTasks.java
+++ b/src/test/java/org/waarp/openr66/protocol/test/TestTasks.java
@@ -22,6 +22,7 @@
 import org.waarp.common.command.exception.CommandAbstractException;
 import org.waarp.common.database.DbAdmin;
 import org.waarp.common.database.exception.WaarpDatabaseException;
+import org.waarp.common.logging.WaarpLogLevel;
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.common.logging.WaarpSlf4JLoggerFactory;
 import org.waarp.openr66.configuration.FileBasedConfiguration;
@@ -69,14 +70,14 @@ public class TestTasks {
    */
   public static void main(String[] args) {
     WaarpLoggerFactory.setDefaultFactory(new WaarpSlf4JLoggerFactory(
-        null));
+        WaarpLogLevel.WARN));
     if (args.length < 4) {
       System.err.println(
           "Need config inDirectory outDirectory filename (in inDirectory)");
       return;
     }
     if (!FileBasedConfiguration
-        .setClientConfigurationFromXml(Configuration.configuration, args[0])) {
+        .setSubmitClientConfigurationFromXml(Configuration.configuration, args[0])) {
       System.err
           .println("Needs a correct configuration file as first argument");
       return;
diff --git a/src/test/java/org/waarp/openr66/protocol/test/TestTransaction.java b/src/test/java/org/waarp/openr66/protocol/test/TestTransaction.java
index 4dde925c0..40fec852b 100644
--- a/src/test/java/org/waarp/openr66/protocol/test/TestTransaction.java
+++ b/src/test/java/org/waarp/openr66/protocol/test/TestTransaction.java
@@ -19,6 +19,7 @@
  ******************************************************************************/
 package org.waarp.openr66.protocol.test;
 
+import org.waarp.common.logging.WaarpLogLevel;
 import org.waarp.common.logging.WaarpLogger;
 import org.waarp.common.logging.WaarpLoggerFactory;
 import org.waarp.common.logging.WaarpSlf4JLoggerFactory;
@@ -70,7 +71,7 @@ public TestTransaction(NetworkTransaction networkTransaction,
 
   public static void main(String[] args) {
     WaarpLoggerFactory.setDefaultFactory(new WaarpSlf4JLoggerFactory(
-        null));
+        WaarpLogLevel.WARN));
     if (logger == null) {
       logger = WaarpLoggerFactory.getLogger(TestTransaction.class);
     }
diff --git a/src/test/resources/Linux/config/config-clientNoDB_B.xml b/src/test/resources/Linux/config/config-clientNoDB_B.xml
index eab9adf5d..222922f05 100755
--- a/src/test/resources/Linux/config/config-clientNoDB_B.xml
+++ b/src/test/resources/Linux/config/config-clientNoDB_B.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<config xmlns:x0="http://www.w3.org/2001/XMLSchema">
+<config>
     <comment>Example of config file: change its as your need.</comment>
     <identity>
         <hostid>hostb</hostid>
diff --git a/src/test/resources/Linux/config/config-serverA-minimal.xml b/src/test/resources/Linux/config/config-serverA-minimal.xml
index b7e64d326..3ee62ee2b 100755
--- a/src/test/resources/Linux/config/config-serverA-minimal.xml
+++ b/src/test/resources/Linux/config/config-serverA-minimal.xml
@@ -12,7 +12,7 @@
         <serverpasswd>c5f4876737cf351a</serverpasswd>
         <usenossl>True</usenossl>
         <usessl>True</usessl>
-        <httpadmin>src/test/resources/Linux/httpadmin</httpadmin>
+        <httpadmin>src/main/httpadmin</httpadmin>
         <admkeypath>src/test/resources/Linux/config/certs/testsslnocert.jks</admkeypath>
         <admkeystorepass>testsslnocert</admkeystorepass>
         <admkeypass>testalias</admkeypass>
diff --git a/src/test/resources/Linux/config/config-serverB.xml b/src/test/resources/Linux/config/config-serverB.xml
index 0be236c7d..6353105c8 100755
--- a/src/test/resources/Linux/config/config-serverB.xml
+++ b/src/test/resources/Linux/config/config-serverB.xml
@@ -14,7 +14,7 @@
         <usessl>False</usessl>
         <usehttpcomp>False</usehttpcomp>
         <uselocalexec>False</uselocalexec>
-        <httpadmin>src/test/resources/Linux/httpadmin</httpadmin>
+        <httpadmin>src/main/httpadmin</httpadmin>
         <admkeypath>src/test/resources/Linux/config/certs/testsslnocert.jks</admkeypath>
         <admkeystorepass>testsslnocert</admkeystorepass>
         <admkeypass>testalias</admkeypass>
diff --git a/src/test/resources/Linux/config/config-serverInitA.xml b/src/test/resources/Linux/config/config-serverInitA.xml
index 945acfcfc..2c68cce57 100755
--- a/src/test/resources/Linux/config/config-serverInitA.xml
+++ b/src/test/resources/Linux/config/config-serverInitA.xml
@@ -14,7 +14,7 @@
         <uselocalexec>False</uselocalexec>
         <serveradmin>monadmin</serveradmin>
         <serverpasswd>c5f4876737cf351a</serverpasswd>
-        <httpadmin>src/test/resources/Linux/httpadmin/</httpadmin>
+        <httpadmin>src/main/httpadmin/</httpadmin>
         <admkeypath>src/test/resources/Linux/config/certs/testsslnocert.jks</admkeypath>
         <admkeystorepass>testsslnocert</admkeystorepass>
         <admkeypass>testalias</admkeypass>
diff --git a/src/test/resources/Linux/config/config-serverInitB.xml b/src/test/resources/Linux/config/config-serverInitB.xml
index dd462614e..2f0cdc5f6 100755
--- a/src/test/resources/Linux/config/config-serverInitB.xml
+++ b/src/test/resources/Linux/config/config-serverInitB.xml
@@ -14,7 +14,7 @@
         <uselocalexec>False</uselocalexec>
         <serveradmin>monadmin</serveradmin>
         <serverpasswd>c5f4876737cf351a</serverpasswd>
-        <httpadmin>src/test/resources/Linux/httpadmin/</httpadmin>
+        <httpadmin>src/main/httpadmin/</httpadmin>
         <admkeypath>src/test/resources/Linux/config/certs/testsslnocert.jks</admkeypath>
         <admkeystorepass>testsslnocert</admkeystorepass>
         <admkeypass>testalias</admkeypass>