diff --git a/src/main/resources/META-INF/spring.schemas b/src/main/resources/META-INF/spring.schemas
index 02ccdc94..c273536e 100644
--- a/src/main/resources/META-INF/spring.schemas
+++ b/src/main/resources/META-INF/spring.schemas
@@ -4,11 +4,11 @@ http\://www.springframework.org/schema/gemfire/spring-gemfire-1.2.xsd=org/spring
 http\://www.springframework.org/schema/gemfire/spring-gemfire-1.3.xsd=org/springframework/data/gemfire/config/spring-gemfire-1.3.xsd
 http\://www.springframework.org/schema/gemfire/spring-gemfire-1.4.xsd=org/springframework/data/gemfire/config/spring-gemfire-1.4.xsd
 http\://www.springframework.org/schema/gemfire/spring-gemfire-1.5.xsd=org/springframework/data/gemfire/config/spring-gemfire-1.5.xsd
-http\://www.springframework.org/schema/gemfire/spring-gemfire-2.0.xsd=org/springframework/data/gemfire/config/spring-gemfire-2.0.xsd
-http\://www.springframework.org/schema/gemfire/spring-gemfire.xsd=org/springframework/data/gemfire/config/spring-gemfire-2.0.xsd
+http\://www.springframework.org/schema/gemfire/spring-gemfire-1.6.xsd=org/springframework/data/gemfire/config/spring-gemfire-1.6.xsd
+http\://www.springframework.org/schema/gemfire/spring-gemfire.xsd=org/springframework/data/gemfire/config/spring-gemfire-1.6.xsd
 http\://www.springframework.org/schema/data/gemfire/spring-data-gemfire-1.2.xsd=org/springframework/data/gemfire/config/spring-data-gemfire-1.2.xsd
 http\://www.springframework.org/schema/data/gemfire/spring-data-gemfire-1.3.xsd=org/springframework/data/gemfire/config/spring-data-gemfire-1.3.xsd
 http\://www.springframework.org/schema/data/gemfire/spring-data-gemfire-1.4.xsd=org/springframework/data/gemfire/config/spring-data-gemfire-1.4.xsd
 http\://www.springframework.org/schema/data/gemfire/spring-data-gemfire-1.5.xsd=org/springframework/data/gemfire/config/spring-data-gemfire-1.5.xsd
-http\://www.springframework.org/schema/data/gemfire/spring-data-gemfire-2.0.xsd=org/springframework/data/gemfire/config/spring-data-gemfire-2.0.xsd
-http\://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd=org/springframework/data/gemfire/config/spring-data-gemfire-2.0.xsd
+http\://www.springframework.org/schema/data/gemfire/spring-data-gemfire-1.6.xsd=org/springframework/data/gemfire/config/spring-data-gemfire-1.6.xsd
+http\://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd=org/springframework/data/gemfire/config/spring-data-gemfire-1.6.xsd
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.0.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-1.6.xsd
similarity index 99%
rename from src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.0.xsd
rename to src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-1.6.xsd
index 77199f26..7e4e051f 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.0.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-1.6.xsd
@@ -9,22 +9,21 @@
 			targetNamespace="http://www.springframework.org/schema/data/gemfire"
 			elementFormDefault="qualified"
 			attributeFormDefault="unqualified"
-			version="2.0">
+			version="1.6">
 	<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/context"
+				schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd" />
 	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
 				schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/gemfire"
 				schemaLocation="http://www.springframework.org/schema/gemfire/spring-gemfire.xsd"/>
-	<xsd:import namespace="http://www.springframework.org/schema/context"
-				schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 	<!-- -->
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
             Namespace support for the Spring Data GemFire Client side data access.
         ]]></xsd:documentation>
 	</xsd:annotation>
-	<!-- -->
 	<!-- Repositories -->
 	<xsd:element name="repositories">
 		<xsd:complexType>
@@ -37,6 +36,27 @@
 		</xsd:complexType>
 	</xsd:element>
 	<!-- -->
+	<xsd:attributeGroup name="gemfire-repository-attributes">
+		<xsd:attribute name="mapping-context-ref" type="mappingContextRef">
+			<xsd:annotation>
+				<xsd:documentation>
+					The reference to a MappingContext. If not set a default one will be created.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:attributeGroup>
+	<!-- -->
+	<xsd:simpleType name="mappingContextRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.gemfire.GemfireMappingContext"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+	<!-- Function Executions -->
 	<xsd:element name="function-executions">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -70,29 +90,7 @@
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	<!-- -->
-	<xsd:attributeGroup name="gemfire-repository-attributes">
-		<xsd:attribute name="mapping-context-ref" type="mappingContextRef">
-			<xsd:annotation>
-				<xsd:documentation>
-					The reference to a MappingContext. If not set a default one will be created.
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:attributeGroup>
-	<!-- -->
-	<xsd:simpleType name="mappingContextRef">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation kind="ref">
-					<tool:assignable-to type="org.springframework.data.gemfire.GemfireMappingContext"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:union memberTypes="xsd:string"/>
-	</xsd:simpleType>
 	<!-- DataSource -->
-
 	<xsd:element name="datasource">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -145,6 +143,7 @@ Defines a connection from a Cache client to a set of GemFire Cache Servers.
 						   type="xsd:string" use="optional" />
 		</xsd:complexType>
 	</xsd:element>
+	<!-- JSON support -->
 	<xsd:element name="json-region-autoproxy">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.0.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.6.xsd
similarity index 98%
rename from src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.0.xsd
rename to src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.6.xsd
index dc01405e..9f94e99e 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.0.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.6.xsd
@@ -8,7 +8,7 @@
 			targetNamespace="http://www.springframework.org/schema/gemfire"
 			elementFormDefault="qualified"
 			attributeFormDefault="unqualified"
-			version="2.0">
+			version="1.6">
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/context" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
@@ -440,7 +440,7 @@ GemFire 8's new cluster-based configuration service.
 			]]></xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
-
+	<!-- -->
 	<xsd:complexType name="baseLookupRegionType">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -2909,7 +2909,7 @@ The id of the cache - default is gemfireCache
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
-
+	<!-- -->
 	<xsd:element name="gateway-receiver" type="gatewayReceiverType" />
 	<!-- -->
 	<xsd:element name="function-service">
@@ -3004,7 +3004,6 @@ Used for convenience. If no reference exists, use inner bean declarations.
 		</xsd:attribute>
 	</xsd:complexType>
 	<!-- -->
-	<!-- -->
 	<xsd:complexType name="gatewayEventSubstitutionFilterType">
 		<xsd:annotation>
 			<xsd:documentation source="com.gemstone.gemfire.cache.wan.GatewayEventSubstitutionFilter"><![CDATA[
@@ -3064,7 +3063,7 @@ Used for convenience. If no reference exists, use inner bean declarations.
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-	<!-- Gemfire 6 WAN Gateway schema -->
+	<!-- GemFire 6 WAN Gateway schema -->
 	<xsd:complexType name="gatewayHubType">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -3072,8 +3071,7 @@ Deprecated as of Gemfire 7
 ]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
-			<xsd:element name="gateway" type="gatewayType" minOccurs="0"
-						 maxOccurs="unbounded">
+			<xsd:element name="gateway" type="gatewayType" minOccurs="0" maxOccurs="unbounded">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 Deprecated as of Gemfire 7
@@ -3084,15 +3082,8 @@ Deprecated as of Gemfire 7
 		<xsd:attribute name="id" type="xsd:string" use="required">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The id of this hub
-                    ]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="port" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The port for this hub (integer value, if not specified, Gemfire will select an open port)
-                    ]]></xsd:documentation>
+The id of this GatewayHub.
+				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="cache-ref" type="xsd:string" use="optional">
@@ -3102,32 +3093,35 @@ The id of the cache - default is gemfireCache
                   ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="bind-address" type="xsd:string"
-					   use="optional">
+		<xsd:attribute name="bind-address" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 Specifies the bind address (IP address or host name) for the gateway hub
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="socket-buffer-size" type="xsd:string"
-					   use="optional">
+		<xsd:attribute name="port" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-Specifies the socket buffer size in bytes
-            ]]></xsd:documentation>
+The port for this hub (integer value, if not specified, Gemfire will select an open port)
+                    ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="manual-start" type="xsd:string"
-					   use="optional">
+		<xsd:attribute name="manual-start" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 Specifies if the gateway hub is manually (true) or automatically(false) started
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="startup-policy" type="xsd:string"
-					   use="optional">
+		<xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Specifies the socket buffer size in bytes
+            ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="startup-policy" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 Specifies the startup policy (primary,secondary, none) for the gateway hub
@@ -3142,12 +3136,12 @@ Specifies the startup policy (primary,secondary, none) for the gateway hub
 Deprecated as of Gemfire 7
 ]]></xsd:documentation>
 		</xsd:annotation>
+		<xsd:attribute name="endpoint-id" type="xsd:string" use="required">
+		</xsd:attribute>
 		<xsd:attribute name="host" type="xsd:string" use="required">
 		</xsd:attribute>
 		<xsd:attribute name="port" type="xsd:string" use="required">
 		</xsd:attribute>
-		<xsd:attribute name="endpoint-id" type="xsd:string" use="required">
-		</xsd:attribute>
 	</xsd:complexType>
 	<!-- -->
 	<xsd:complexType name="gatewayQueueType">
@@ -3156,24 +3150,7 @@ Deprecated as of Gemfire 7
 Deprecated as of Gemfire 7
 ]]></xsd:documentation>
 		</xsd:annotation>
-		<xsd:attribute name="enable-batch-conflation" type="xsd:string"
-					   use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Specifies whether batch conflation is enabled (true or false)
-            ]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="batch-time-interval" type="xsd:string"
-					   use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The maximum time interval that can elapse before a partial batch is sent from a GatewaySender to its corresponding GatewayReceiver.
-            ]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="alert-threshold" type="xsd:string"
-					   use="optional">
+		<xsd:attribute name="alert-threshold" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 Specifies the alert threshold in miliseconds, indicating the maximum time elapsed from when the gateway sent the message
@@ -3188,26 +3165,38 @@ Specifies the batch size
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="persistent" type="xsd:string" use="optional">
+		<xsd:attribute name="batch-time-interval" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-Specifies whether persistence is enabled: true or false(default)
+The maximum time interval that can elapse before a partial batch is sent from a GatewaySender to its corresponding GatewayReceiver.
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="disk-store-ref" type="xsd:string"
-					   use="optional">
+		<xsd:attribute name="disk-store-ref" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 Indicates the id of disk store to use for persistence
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="maximum-queue-memory" type="xsd:string"
-					   use="optional">
+		<xsd:attribute name="enable-batch-conflation" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Specifies whether batch conflation is enabled (true or false)
+            ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="maximum-queue-memory" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 Specifies the maximum memory in MB to allocate for the queue
+            ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="persistent" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Specifies whether persistence is enabled: true or false(default)
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -3221,7 +3210,7 @@ Deprecated as of Gemfire 7
 		</xsd:annotation>
 		<xsd:sequence>
 			<xsd:choice>
-				<xsd:element name="gateway-endpoint" minOccurs="1" maxOccurs="unbounded" type="gatewayEndpointType"/>
+				<xsd:element name="gateway-endpoint" type="gatewayEndpointType" minOccurs="1" maxOccurs="unbounded"/>
 				<xsd:element name="gateway-listener" minOccurs="1" maxOccurs="1">
 					<xsd:annotation>
 						<xsd:documentation
@@ -3256,8 +3245,7 @@ use inner bean declarations.
 					</xsd:complexType>
 				</xsd:element>
 			</xsd:choice>
-			<xsd:element name="gateway-queue" minOccurs="0"
-						 maxOccurs="1" type="gatewayQueueType" />
+			<xsd:element name="gateway-queue" type="gatewayQueueType" minOccurs="0" maxOccurs="1"/>
 		</xsd:sequence>
 		<xsd:attribute name="gateway-id" type="xsd:string" use="required">
 			<xsd:annotation>
@@ -3266,24 +3254,14 @@ Specifies the id for this gateway
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="socket-buffer-size" type="xsd:string"
-					   use="optional">
+		<xsd:attribute name="concurrency-level" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-Specifies the socket buffer size in bytes
+Specifies the number of parallel threads
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="socket-read-timeout" type="xsd:string"
-					   use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Specifies the socket read timeout in milliseconds
-            ]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="order-policy" type="xsd:string"
-					   use="optional">
+		<xsd:attribute name="order-policy" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 Specifies the order policy - This only applies if parallel is enabled:
@@ -3293,11 +3271,17 @@ THREAD:Indicates that events will be parallelized based on the event's originati
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="concurrency-level" type="xsd:string"
-					   use="optional">
+		<xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-Specifies the number of parallel threads
+Specifies the socket buffer size in bytes
+            ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-read-timeout" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Specifies the socket read timeout in milliseconds
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -3310,8 +3294,7 @@ Deprecated as of Gemfire 7
 ]]></xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
-	<!-- End Gemfire 6 WAN Gateway schema -->
-
+	<!-- End GemFire 6 WAN Gateway schema -->
 	<!-- Function Annotation Support -->
 	<xsd:element name="annotation-driven">
 		<xsd:annotation>