diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/config/package-info.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/config/package-info.java
new file mode 100644
index 0000000..89cc17d
--- /dev/null
+++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/config/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * SMB-specific file list filter classes.
+ */
+package org.springframework.integration.smb.config;
diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/package-info.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/package-info.java
new file mode 100644
index 0000000..2df5c73
--- /dev/null
+++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * SMB Namespace support classes.
+ */
+package org.springframework.integration.smb.filters;
diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/package-info.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/package-info.java
new file mode 100644
index 0000000..dde9ee1
--- /dev/null
+++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Inbound Channel Adapters implementations for SMB protocol.
+ */
+package org.springframework.integration.smb.inbound;
diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/package-info.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/package-info.java
new file mode 100644
index 0000000..191b0eb
--- /dev/null
+++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Root package of the Spring Integration SMB Module.
+ */
+package org.springframework.integration.smb;
diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/package-info.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/package-info.java
new file mode 100644
index 0000000..1f8818c
--- /dev/null
+++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * SMB Remote Session abstraction support classes.
+ */
+package org.springframework.integration.smb.session;
diff --git a/spring-integration-smb/src/main/resources/org/springframework/integration/smb/config/spring-integration-smb-0.5.xsd b/spring-integration-smb/src/main/resources/org/springframework/integration/smb/config/spring-integration-smb-0.5.xsd
index 0bb6c7a..0aeb4e0 100644
--- a/spring-integration-smb/src/main/resources/org/springframework/integration/smb/config/spring-integration-smb-0.5.xsd
+++ b/spring-integration-smb/src/main/resources/org/springframework/integration/smb/config/spring-integration-smb-0.5.xsd
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.springframework.org/schema/integration/smb"
 			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:beans="http://www.springframework.org/schema/beans"
 			xmlns:tool="http://www.springframework.org/schema/tool"
 			xmlns:integration="http://www.springframework.org/schema/integration"
 			targetNamespace="http://www.springframework.org/schema/integration/smb"
@@ -11,13 +10,13 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.0.xsd"/>
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration.xsd"/>
 
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
 				The handler for namespace 'http://www.springframework.org/schema/integration/smb'
 				is set to 'org.springframework.integration.smb.config.SmbNamespaceHandler'
-				in file 'spring.handlers'. SmbNamespaceHandler sets the implemenation
+				in file 'spring.handlers'. SmbNamespaceHandler sets the implementation
 				of 'inbound-channel-adapter' to class 'SmbInboundChannelAdapterParser'
 				etc.
 			]]></xsd:documentation>
@@ -33,6 +32,10 @@
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="base-smb-adapter-type">
+					<xsd:all>
+						<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
+						<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType" minOccurs="0" maxOccurs="1" />
+					</xsd:all>
 					<xsd:attribute name="remote-directory" type="xsd:string">
 						<xsd:annotation>
 							<xsd:documentation>
@@ -202,7 +205,7 @@
 						<xsd:annotation>
 							<xsd:documentation>
 								Tells this adapter if local directory must be
-								auto-created if it doesn''t exist. Default is TRUE.
+								auto-created if it doesn't exist. Default is TRUE.
 							</xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
@@ -220,7 +223,6 @@
 	</xsd:element>
 
 	<xsd:complexType name="base-smb-adapter-type">
-		<xsd:attribute name="id" type="xsd:string"/>
 		<xsd:attribute name="session-factory" type="xsd:string" use="required">
 			<xsd:annotation>
 				<xsd:appinfo>
@@ -229,32 +231,10 @@
 					</tool:annotation>
 				</xsd:appinfo>
 				<xsd:documentation><![CDATA[
-					Reference to a [org.springframework.integration.smb.session.SmbSessionFactory] bean.
+					Reference to a org.springframework.integration.smb.session.SmbSessionFactory bean.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="cache-sessions" type="xsd:string" default="true">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-					Specify whether the Sessions should be cached. Default is true.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="channel" use="optional" type="xsd:string">
-			<xsd:annotation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-					</tool:annotation>
-				</xsd:appinfo>
-				<xsd:documentation>
-					Identifies channel attached to this adapter. Depending on the
-					type of the adapter this channel could be the receiving channel
-					(e.g., outbound-channel-adapter) or channel where messages
-					will be sent to by this adapter (e.g., inbound-channel-adapter).
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 		<xsd:attribute name="charset" type="xsd:string" default="UTF-8">
 		<xsd:annotation>
 				<xsd:documentation>
@@ -263,6 +243,7 @@
 				</xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
+		<xsd:attributeGroup ref="integration:channelAdapterAttributes" />
 	</xsd:complexType>
 
 </xsd:schema>
diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbParserInboundTests-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbParserInboundTests-context.xml
index e99262f..bd0ec34 100644
--- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbParserInboundTests-context.xml
+++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbParserInboundTests-context.xml
@@ -18,7 +18,6 @@
 
 	<int-smb:inbound-channel-adapter id="adapterSmb"
 		session-factory="smbSessionFactory"
-		cache-sessions="false"
 		channel="smbIn"
 		filename-pattern="foo"
 		local-directory="test-temp/local-10"
@@ -30,7 +29,6 @@
 
 	<int-smb:inbound-channel-adapter id="adapterSmb2"
 		session-factory="smbSessionFactory"
-		cache-sessions="false"
 		channel="smbIn"
 		filter="filter"
 		local-directory="test-temp"
diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests-context.xml
index c244600..c590242 100644
--- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests-context.xml
@@ -17,7 +17,6 @@
 	<int-smb:inbound-channel-adapter id="smbInbound"
 				channel="smbChannel"
 				session-factory="smbSessionFactory"
-				cache-sessions="false"
 				charset="UTF-8"
 				auto-create-local-directory="true"
 				delete-remote-files="true"
diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterSample-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterSample-context.xml
index 6558107..c4d50da 100644
--- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterSample-context.xml
+++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterSample-context.xml
@@ -21,7 +21,6 @@
 	<int-smb:inbound-channel-adapter id="smbInboundChannelAdapter"
 		channel="smbInboundChannel"
 		session-factory="smbSessionFactory"
-		cache-sessions="true"
 		charset="UTF-8"
 		remote-directory="test-temp/remote-4"
 		remote-file-separator="/"
diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests-context.xml
index 176369b..025860b 100644
--- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests-context.xml
@@ -20,7 +20,6 @@
 	<int-smb:outbound-channel-adapter id="smbOutboundChannelAdapter"
 		channel="smbPubSubChannel"
 		session-factory="smbSessionFactory"
-		cache-sessions="false"
 		remote-directory="test-temp/remote-5"
 		charset="UTF-8"
 		remote-file-separator="."