diff --git a/web/WEB-INF/cxf-beans.xml b/web/WEB-INF/cxf-beans.xml
index 9ab7dde..78c0ce4 100644
--- a/web/WEB-INF/cxf-beans.xml
+++ b/web/WEB-INF/cxf-beans.xml
@@ -1,6 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
-	xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+	xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:simple="http://cxf.apache.org/simple"
 	xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
@@ -8,43 +8,87 @@
 
 	<import resource="classpath:META-INF/cxf/cxf.xml" />
 	<!-- deprecated since CXF 2.4.0 -->
-	<!-- 
-	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
-	 -->
+	<!-- <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" /> 
+		<import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" 
+		/> -->
 	<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
 
 	<jaxws:endpoint id="archiveservice"
-		implementor="net.brutex.xservices.ws.impl.ArchiveServiceImpl" address="/ArchiveService" />
+		implementor="net.brutex.xservices.ws.impl.ArchiveServiceImpl" address="/ArchiveService">
+		<jaxws:dataBinding>
+			<bean class="org.apache.cxf.aegis.databinding.AegisDatabinding" />
+		</jaxws:dataBinding>
+	</jaxws:endpoint>
 
 	<jaxws:endpoint id="dateservice"
-		implementor="net.brutex.xservices.ws.impl.DateServiceImpl" address="/DateService" />
-		
+		implementor="net.brutex.xservices.ws.impl.DateServiceImpl" address="/DateService">
+		<jaxws:dataBinding>
+			<bean class="org.apache.cxf.aegis.databinding.AegisDatabinding" />
+		</jaxws:dataBinding>
+	</jaxws:endpoint>
+
 	<jaxws:endpoint id="fileservice"
 		implementor="net.brutex.xservices.ws.impl.FileServiceImpl" address="/FileService">
 		<jaxws:properties>
 			<entry key="mtom-enabled" value="false" />
 		</jaxws:properties>
+		<jaxws:dataBinding>
+			<bean class="org.apache.cxf.aegis.databinding.AegisDatabinding" />
+		</jaxws:dataBinding>
 	</jaxws:endpoint>
-	
+
 	<!-- This is the MTOM enabled FileServices endpoint -->
 	<jaxws:endpoint id="fileservice2"
 		implementor="net.brutex.xservices.ws.impl.FileServiceImpl" address="/FileServiceMTOM">
 		<jaxws:properties>
 			<entry key="mtom-enabled" value="true" />
-			<entry key="attachment-directory" value="c:\temp"/>
-			<entry key="attachment-memory-threshold" value="2000"/>
+			<entry key="attachment-directory" value="c:\temp" />
+			<entry key="attachment-memory-threshold" value="2000" />
 		</jaxws:properties>
+		<jaxws:dataBinding>
+			<bean class="org.apache.cxf.aegis.databinding.AegisDatabinding" />
+		</jaxws:dataBinding>
 	</jaxws:endpoint>
-	
-	
+
+
 	<jaxws:endpoint id="executeservice"
-		implementor="net.brutex.xservices.ws.impl.ExecuteServiceImpl" address="/ExecuteService" />
-	
+		implementor="net.brutex.xservices.ws.impl.ExecuteServiceImpl" address="/ExecuteService">
+		<jaxws:dataBinding>
+			<bean class="org.apache.cxf.aegis.databinding.AegisDatabinding" />
+		</jaxws:dataBinding>
+	</jaxws:endpoint>
+
 	<jaxws:endpoint id="jobservice"
-		implementor="net.brutex.xservices.ws.impl.JobServiceImpl" address="/JobService" />
-    
-    
+		implementor="net.brutex.xservices.ws.impl.JobServiceImpl" address="/JobService">
+		<jaxws:dataBinding>
+			<bean class="org.apache.cxf.aegis.databinding.AegisDatabinding" />
+		</jaxws:dataBinding>
+	</jaxws:endpoint>
+
+
 	<jaxws:endpoint id="miscservice"
-		implementor="net.brutex.xservices.ws.impl.MiscServiceImpl" address="/MiscService" />
+		implementor="net.brutex.xservices.ws.impl.MiscServiceImpl" address="/MiscService">
+		<jaxws:dataBinding>
+			<bean class="org.apache.cxf.aegis.databinding.AegisDatabinding" />
+		</jaxws:dataBinding>
+	</jaxws:endpoint>
+
+	<jaxws:endpoint id="storageservice"
+		implementor="net.brutex.xservices.ws.impl.StorageServiceImpl" address="/StorageService">
+		<jaxws:dataBinding>
+			<bean class="org.apache.cxf.aegis.databinding.AegisDatabinding" />
+		</jaxws:dataBinding>
+	</jaxws:endpoint>
+
+	<jaxws:endpoint id="storageservice2"
+		implementor="net.brutex.xservices.ws.impl.StorageServiceImpl" address="/StorageServiceMTOM">
+		<jaxws:properties>
+			<entry key="mtom-enabled" value="true" />
+			<entry key="attachment-directory" value="c:\temp" />
+			<entry key="attachment-memory-threshold" value="2000" />
+		</jaxws:properties>
+		<jaxws:dataBinding>
+			<bean class="org.apache.cxf.aegis.databinding.AegisDatabinding" />
+		</jaxws:dataBinding>
+	</jaxws:endpoint>
 </beans>
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index f26529e..0ed7bff 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -4,49 +4,44 @@
     <param-name>contextConfigLocation</param-name>
     <param-value>/WEB-INF/cxf-beans.xml</param-value>
   </context-param>
-  
-  	<context-param>
-         <param-name>quartz:config-file</param-name>
-         <param-value>quartz.properties</param-value>
-     </context-param>
-     <context-param>
-         <param-name>quartz:shutdown-on-unload</param-name>
-         <param-value>true</param-value>
-     </context-param>
-     <context-param>
-         <param-name>quartz:wait-on-shutdown</param-name>
-         <param-value>false</param-value>
-     </context-param>
-     <context-param>
-         <param-name>quartz:start-scheduler-on-load</param-name>
-         <param-value>true</param-value>
-     </context-param>
-    
+  <context-param>
+    <param-name>quartz:config-file</param-name>
+    <param-value>quartz.properties</param-value>
+  </context-param>
+  <context-param>
+    <param-name>quartz:shutdown-on-unload</param-name>
+    <param-value>true</param-value>
+  </context-param>
+  <context-param>
+    <param-name>quartz:wait-on-shutdown</param-name>
+    <param-value>false</param-value>
+  </context-param>
+  <context-param>
+    <param-name>quartz:start-scheduler-on-load</param-name>
+    <param-value>true</param-value>
+  </context-param>
   <listener>
     <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
   </listener>
   <listener>
-         <listener-class>
+    <listener-class>
              org.quartz.ee.servlet.QuartzInitializerListener
          </listener-class>
-     </listener>
+  </listener>
   <servlet>
     <servlet-name>XServices</servlet-name>
     <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
-  
-  <servlet> 
-	  <servlet-name>QuartzInitializer</servlet-name> 
-	  <servlet-class>org.quartz.ee.servlet.QuartzInitializerServlet</servlet-class> 
-	  <init-param>
-
-	    <param-name>shutdown-on-unload</param-name>
-	    <param-value>true</param-value>
-	  </init-param>
-	  <load-on-startup>2</load-on-startup>
-
-	</servlet>
+  <servlet>
+    <servlet-name>QuartzInitializer</servlet-name>
+    <servlet-class>org.quartz.ee.servlet.QuartzInitializerServlet</servlet-class>
+    <init-param>
+      <param-name>shutdown-on-unload</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <load-on-startup>2</load-on-startup>
+  </servlet>
   <servlet-mapping>
     <servlet-name>XServices</servlet-name>
     <url-pattern>/*</url-pattern>
@@ -57,4 +52,19 @@
   <welcome-file-list>
     <welcome-file>index.html</welcome-file>
   </welcome-file-list>
+  <servlet>
+    <description></description>
+    <display-name>AgentServlet</display-name>
+    <servlet-name>AgentServlet</servlet-name>
+    <servlet-class>net.brutex.xservices.agent.AgentServlet</servlet-class>
+    <init-param>
+      <description>Port to listen on</description>
+      <param-name>port</param-name>
+      <param-value>1313</param-value>
+    </init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>AgentServlet</servlet-name>
+    <url-pattern>/AgentServlet</url-pattern>
+  </servlet-mapping>
 </web-app>
\ No newline at end of file