diff --git a/pom.xml b/pom.xml
index fc9c51c..c7eb97a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.nhind</groupId>
     <artifactId>xdmail</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>8.1.4-SNAPSHOT</version>
     <name>NHIN Direct XD* Mail Gateway</name>
     <description>NHIN Direct XD* Mail Gateway</description>
     <url>https://github.com/DirectProjectJavaRI/xdmail</url>  
@@ -94,19 +94,19 @@
         <dependency>
             <groupId>org.nhind</groupId>
             <artifactId>xd-common</artifactId>
-            <version>8.0.0</version>
+            <version>8.1.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency> 
         <dependency>
             <groupId>org.nhind</groupId>
             <artifactId>agent</artifactId>
-            <version>8.0.0</version>
+            <version>8.1.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.nhind</groupId>
             <artifactId>gateway</artifactId>
-            <version>8.0.0</version>
+            <version>8.1.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>          
 		<dependency>
@@ -130,7 +130,12 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-rabbit</artifactId>
 			<scope>test</scope>
-		</dependency>			                
+		</dependency>
+      <dependency>
+        <groupId>javax.xml.ws</groupId>
+        <artifactId>jaxws-api</artifactId>
+        <version>2.3.1</version>
+      </dependency>
     </dependencies>
 
     <build>
@@ -305,24 +310,25 @@
         </plugins>
     </reporting>
 
-    <distributionManagement>
-        <site>
-            <id>nhind-site</id>
-            <name>NHIN Direct API publication site</name>
-            <url>sftp://api.nhindirect.org/x/www/api.nhindirect.org/java/site/xdmail/${project.version}
-            </url>
-        </site>
-        <snapshotRepository>
-            <id>sonatype-snapshot</id>
-            <name>Sonatype OSS Maven SNAPSHOT Repository</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-            <uniqueVersion>false</uniqueVersion>
-         </snapshotRepository>
-         <repository>
-            <id>sonatype-release</id>
-            <name>Sonatype OSS Maven Release Repositor</name>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-            <uniqueVersion>false</uniqueVersion>
-         </repository>        
-    </distributionManagement>
+  <distributionManagement>
+    <site>
+      <id>nhind-site</id>
+      <name>NHIN Direct API publication site</name>
+      <url>sftp://api.nhindirect.org/x/www/api.nhindirect.org/java/site/xdmail/${project.version}
+      </url>
+    </site>
+    <snapshotRepository>
+      <id>sonatype-snapshot</id>
+      <name>Sonatype OSS Maven SNAPSHOT Repository</name>
+      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+      <uniqueVersion>false</uniqueVersion>
+    </snapshotRepository>
+    <repository>
+      <id>sonatype-release</id>
+      <name>Sonatype OSS Maven Release Repositor</name>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+      <uniqueVersion>false</uniqueVersion>
+    </repository>
+  </distributionManagement>
+
 </project>
diff --git a/src/main/java/org/nhind/mail/service/XDDeliveryCore.java b/src/main/java/org/nhind/mail/service/XDDeliveryCore.java
index 92b66d3..3012f3b 100644
--- a/src/main/java/org/nhind/mail/service/XDDeliveryCore.java
+++ b/src/main/java/org/nhind/mail/service/XDDeliveryCore.java
@@ -103,6 +103,7 @@ public boolean processAndDeliverXDMessage(SMTPMailMessage smtpMailMessage) throw
 
                 for (String directTo : recipAddresses)
                 {
+                    log.debug("GOING TO SEND TO " + resolver.getXdEndpoints(recipAddresses).toString() + " OVER " + endpointUrl);
                     String response = documentRepository.forwardRequest(endpointUrl, request, directTo, sender.toString());
 
                     if (!isSuccessful(response))
diff --git a/src/main/java/org/nhind/xd/springconfig/XDDeliveryConfig.java b/src/main/java/org/nhind/xd/springconfig/XDDeliveryConfig.java
index 214a3f6..f698070 100644
--- a/src/main/java/org/nhind/xd/springconfig/XDDeliveryConfig.java
+++ b/src/main/java/org/nhind/xd/springconfig/XDDeliveryConfig.java
@@ -17,7 +17,7 @@
 @Configuration
 public class XDDeliveryConfig
 {
-	@Value("direct.gateway.xd.endpointUrl")
+	@Value("${direct.gateway.xd.endpointUrl: http://localhost:8080/xd/services/DocumentRepository_Service}")
 	protected String endpointURL;
 	
 	@Autowired
diff --git a/src/main/java/org/nhind/xd/streams/processors/XDRemoteDeliveryProcessor.java b/src/main/java/org/nhind/xd/streams/processors/XDRemoteDeliveryProcessor.java
index 13ca69f..b1d7aad 100644
--- a/src/main/java/org/nhind/xd/streams/processors/XDRemoteDeliveryProcessor.java
+++ b/src/main/java/org/nhind/xd/streams/processors/XDRemoteDeliveryProcessor.java
@@ -43,8 +43,9 @@ public Consumer<Message<?>> directXDDeliveryInput()
 			try
 			{
 				final SMTPMailMessage smtpMessage = SMTPMailMessageConverter.fromStreamMessage(streamMsg);
-		        
-		        deliveryCore.processAndDeliverXDMessage(smtpMessage);
+
+            log.debug("XDRemoteDeliveryProcessor processing message from " + smtpMessage.getMailFrom().toString());
+            deliveryCore.processAndDeliverXDMessage(smtpMessage);
 			}
 			catch (MessagingException e)
 			{
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index e89b1f4..321944d 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -1,4 +1,4 @@
-spring: 
+spring:
   cloud: 
     stream: 
       source: direct-smtp-gateway-message
@@ -9,4 +9,12 @@ spring:
        
         directXDDeliveryInput-in-0: 
           destination: direct-xd-delivery    
-          group: direct-xd-delivery-group                 
\ No newline at end of file
+          group: direct-xd-delivery-group
+
+  main:
+    allow-bean-definition-overriding: true
+
+direct:
+  gateway:
+    xd:
+      endpointurl: http://localhost:8080/xd/services/DocumentRepository_Service
\ No newline at end of file