diff --git a/pom.xml b/pom.xml
index e1d9726c..846b9223 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-geode</artifactId>
-	<version>1.2.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0.BUILD-SNAPSHOT</version>
 
 	<name>Spring Data Geode</name>
 
@@ -22,7 +22,7 @@
 		<antlr.version>2.7.7</antlr.version>
 		<apache-shiro.version>1.3.2</apache-shiro.version>
 		<assertj.version>3.6.2</assertj.version>
-		<gemfire.version>1.2.0-SNAPSHOT</gemfire.version>
+		<geode.version>1.2.0-SNAPSHOT</geode.version>
 		<multithreadedtc.version>1.01</multithreadedtc.version>
 		<servlet-api.version>2.5</servlet-api.version>
 		<spring-data-commons.version>2.0.0.BUILD-SNAPSHOT</spring-data-commons.version>
@@ -77,7 +77,7 @@
 		<dependency>
 			<groupId>org.apache.geode</groupId>
 			<artifactId>geode-core</artifactId>
-			<version>${gemfire.version}</version>
+			<version>${geode.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.apache.logging.log4j</groupId>
@@ -96,17 +96,17 @@
 		<dependency>
 			<groupId>org.apache.geode</groupId>
 			<artifactId>geode-cq</artifactId>
-			<version>${gemfire.version}</version>
+			<version>${geode.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.geode</groupId>
 			<artifactId>geode-lucene</artifactId>
-			<version>${gemfire.version}</version>
+			<version>${geode.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.geode</groupId>
 			<artifactId>geode-wan</artifactId>
-			<version>${gemfire.version}</version>
+			<version>${geode.version}</version>
 		</dependency>
 
 		<dependency>
@@ -116,18 +116,6 @@
 			<scope>runtime</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>${jackson}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${jackson}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-spring</artifactId>
@@ -140,6 +128,18 @@
 			<version>${aspectj}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson}</version>
+		</dependency>
+
 		<!-- Logging -->
 		<!-- Slf4j JCL bridge redeclared to be available in compile scope -->
 		<!-- TODO Remove -->
diff --git a/src/main/resources/META-INF/spring.schemas b/src/main/resources/META-INF/spring.schemas
index f38fb1bc..b26c32e5 100644
--- a/src/main/resources/META-INF/spring.schemas
+++ b/src/main/resources/META-INF/spring.schemas
@@ -1,10 +1,10 @@
-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/geode/spring-geode-1.0.xsd=org/springframework/data/gemfire/config/spring-geode-1.0.xsd
 http\://www.springframework.org/schema/geode/spring-geode-1.1.xsd=org/springframework/data/gemfire/config/spring-geode-1.1.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/geode/spring-geode.xsd=org/springframework/data/gemfire/config/spring-geode-1.1.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/geode/spring-geode-2.0.xsd=org/springframework/data/gemfire/config/spring-geode-2.0.xsd
+http\://www.springframework.org/schema/geode/spring-gemfire.xsd=org/springframework/data/gemfire/config/spring-geode-2.0.xsd
+http\://www.springframework.org/schema/geode/spring-geode.xsd=org/springframework/data/gemfire/config/spring-geode-2.0.xsd
 http\://www.springframework.org/schema/data/geode/spring-data-geode-1.0.xsd=org/springframework/data/gemfire/config/spring-data-geode-1.0.xsd
 http\://www.springframework.org/schema/data/geode/spring-data-geode-1.1.xsd=org/springframework/data/gemfire/config/spring-data-geode-1.1.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/geode/spring-data-geode.xsd=org/springframework/data/gemfire/config/spring-data-geode-1.1.xsd
+http\://www.springframework.org/schema/data/geode/spring-data-geode-2.0.xsd=org/springframework/data/gemfire/config/spring-data-geode-2.0.xsd
+http\://www.springframework.org/schema/data/geode/spring-data-gemfire.xsd=org/springframework/data/gemfire/config/spring-data-geode-2.0.xsd
+http\://www.springframework.org/schema/data/geode/spring-data-geode.xsd=org/springframework/data/gemfire/config/spring-data-geode-2.0.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-geode-2.0.xsd
similarity index 97%
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-geode-2.0.xsd
index 8ddd8729..3bbacd67 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-geode-2.0.xsd
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns="http://www.springframework.org/schema/data/gemfire"
+<xsd:schema xmlns="http://www.springframework.org/schema/data/geode"
+			xmlns:beans="http://www.springframework.org/schema/beans"
 			xmlns:context="http://www.springframework.org/schema/context"
-			xmlns:gfe="http://www.springframework.org/schema/gemfire"
+			xmlns:gfe="http://www.springframework.org/schema/geode"
 			xmlns:repository="http://www.springframework.org/schema/data/repository"
 			xmlns:tool="http://www.springframework.org/schema/tool"
 			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			targetNamespace="http://www.springframework.org/schema/data/gemfire"
+			targetNamespace="http://www.springframework.org/schema/data/geode"
 			elementFormDefault="qualified"
 			attributeFormDefault="unqualified"
 			version="2.0">
@@ -14,8 +15,8 @@
 				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/geode"
+				schemaLocation="http://www.springframework.org/schema/geode/spring-geode.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 	<!-- -->
 	<xsd:annotation>
@@ -44,7 +45,7 @@
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:attributeGroup>
-	<!-- -->
+	<!-- Mapping -->
 	<xsd:simpleType name="mappingContextRef">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -174,7 +175,7 @@ native GemFire PdxInstance type. True, by default but will incur significant ove
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	<!-- Snapshot Service support -->
+	<!-- Snapshot Service -->
 	<xsd:element name="snapshot-service">
 		<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-geode-2.0.xsd
similarity index 96%
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-geode-2.0.xsd
index 433295ea..31861649 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-geode-2.0.xsd
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns="http://www.springframework.org/schema/gemfire"
+<xsd:schema xmlns="http://www.springframework.org/schema/geode"
+			xmlns:beans="http://www.springframework.org/schema/beans"
+			xmlns:context="http://www.springframework.org/schema/context"
+			xmlns:repository="http://www.springframework.org/schema/data/repository"
 			xmlns:tool="http://www.springframework.org/schema/tool"
 			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			targetNamespace="http://www.springframework.org/schema/gemfire"
+			targetNamespace="http://www.springframework.org/schema/geode"
 			elementFormDefault="qualified"
 			attributeFormDefault="unqualified"
 			version="2.0">
@@ -342,6 +345,103 @@ with Spring configuration meta-data that is specific to the application's needs.
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
+	<!-- Cache Server -->
+	<xsd:element name="cache-server">
+		<xsd:annotation>
+			<xsd:documentation
+				source="org.springframework.data.gemfire.server.CacheServerFactoryBean"><![CDATA[
+Defines a Cache Server for feeding data to remote gemfire clients to a server GemFire Cache Servers.
+Note: In order to instantiate a cacheserver, a GemFire cache needs to be avaialble in the VM.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.apache.geode.cache.server.CacheServer" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence minOccurs="0" maxOccurs="1">
+				<xsd:element name="subscription-config" minOccurs="0" maxOccurs="1">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+The client subscription configuration that is used to control a clients use of server resources towards notification queues.
+				]]></xsd:documentation>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:attribute name="eviction-type" type="xsd:string" use="optional" default="NONE"/>
+						<xsd:attribute name="capacity" type="xsd:string" use="optional" default="1"/>
+						<xsd:attribute name="disk-store" type="xsd:string" use="optional"/>
+					</xsd:complexType>
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the cache server definition (by default "gemfireServer").
+				]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="cache-ref" type="xsd:string" use="optional" default="gemfireCache">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the bean defining the GemFire cache (by default 'gemfireCache').
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="auto-startup" type="xsd:string" use="optional" default="true"/>
+			<xsd:attribute name="bind-address" type="xsd:string" use="optional" />
+			<xsd:attribute name="port" type="xsd:string" use="optional" default="40404">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The port number of the server.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="host-name-for-clients" type="xsd:string" use="optional" />
+			<xsd:attribute name="load-poll-interval" type="xsd:string" use="optional" default="5000"/>
+			<xsd:attribute name="max-connections" type="xsd:string" use="optional" default="800"/>
+			<xsd:attribute name="max-threads" type="xsd:string" use="optional" default="0" />
+			<xsd:attribute name="max-message-count" type="xsd:string" use="optional" default="230000"/>
+			<xsd:attribute name="max-time-between-pings" type="xsd:string" use="optional" default="60000"/>
+			<xsd:attribute name="message-time-to-live" type="xsd:string" use="optional" default="180"/>
+			<xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" default="32768"/>
+			<xsd:attribute name="notify-by-subscription" type="xsd:string" use="optional" default="true"/>
+			<xsd:attribute name="groups" type="xsd:string" use="optional" default="">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The server groups that this server will be a member of given as a comma separated values list.
+				]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="load-probe-ref" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the bean defining the CacheServer Load Probe.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+	<!-- -->
+	<xsd:complexType name="connectionType">
+		<xsd:attribute name="host" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The host name or ip address of the connection.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="port">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The port number of the connection (between 1 and 65535 inclusive).
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:string" />
+			</xsd:simpleType>
+		</xsd:attribute>
+	</xsd:complexType>
 	<!-- Client Cache Type -->
 	<xsd:element name="client-cache">
 		<xsd:annotation>
@@ -404,7 +504,69 @@ Notifies the server that this durable client is ready to receive updates.
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
-	<!-- Abstract Region Type  -->
+	<!-- Client Pool -->
+	<xsd:element name="pool">
+		<xsd:annotation>
+			<xsd:documentation
+				source="org.springframework.data.gemfire.client.PoolFactoryBean"><![CDATA[
+Defines a pool for connections from a client to a set of GemFire Cache Servers.
+
+Note that in order to instantiate a pool, a GemFire cache needs to be already started.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.apache.geode.cache.client.Pool" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:choice>
+				<xsd:element name="locator" type="connectionType" minOccurs="0" maxOccurs="unbounded" />
+				<xsd:element name="server" type="connectionType" minOccurs="0" maxOccurs="unbounded" />
+			</xsd:choice>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the pool definition (by default "gemfirePool").
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="free-connection-timeout" type="xsd:string" use="optional"/>
+			<xsd:attribute name="idle-timeout" type="xsd:string" use="optional"/>
+			<xsd:attribute name="load-conditioning-interval" type="xsd:string" use="optional"/>
+			<xsd:attribute name="keep-alive" type="xsd:string" use="optional" default="false"/>
+			<xsd:attribute name="locators" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Comma-delimited list of Locator endpoints used by this Pool in the form of: host1[port1],host2[port2],...,hostN[portN]
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="max-connections" type="xsd:string" use="optional"/>
+			<xsd:attribute name="min-connections" type="xsd:string" use="optional"/>
+			<xsd:attribute name="multi-user-authentication" type="xsd:string" use="optional"/>
+			<xsd:attribute name="ping-interval" type="xsd:string" use="optional"/>
+			<xsd:attribute name="pr-single-hop-enabled" type="xsd:string" use="optional"/>
+			<xsd:attribute name="read-timeout" type="xsd:string" use="optional"/>
+			<xsd:attribute name="retry-attempts" type="xsd:string" use="optional"/>
+			<xsd:attribute name="server-group" type="xsd:string" use="optional"/>
+			<xsd:attribute name="servers" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Comma-delimited list of Server endpoints used by this Pool in the form of: host1[port1],host2[port2],...,hostN[portN]
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional"/>
+			<xsd:attribute name="statistic-interval" type="xsd:string" use="optional"/>
+			<xsd:attribute name="subscription-ack-interval" type="xsd:string" use="optional"/>
+			<xsd:attribute name="subscription-enabled" type="xsd:string" use="optional"/>
+			<xsd:attribute name="subscription-message-tracking-timeout" type="xsd:string" use="optional"/>
+			<xsd:attribute name="subscription-redundancy" type="xsd:string" use="optional"/>
+			<xsd:attribute name="thread-local-connections" type="xsd:string" use="optional"/>
+		</xsd:complexType>
+	</xsd:element>
+	<!-- Abstract Region Type -->
 	<xsd:complexType name="basicRegionType">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -418,7 +580,7 @@ Notifies the server that this durable client is ready to receive updates.
 	<xsd:complexType name="basicSubRegionType">
 		<xsd:complexContent>
 			<xsd:extension base="baseLookupRegionType">
-				<xsd:attribute name="name" type="xsd:string" use="required">
+				<xsd:attribute name="name" type="xsd:string">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
 The name of the region definition.]]></xsd:documentation>
@@ -427,7 +589,7 @@ The name of the region definition.]]></xsd:documentation>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<!-- Lookup Region Type -->
+	<!-- (Auto) Lookup Region Type -->
 	<xsd:element name="auto-region-lookup">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -646,7 +808,7 @@ The name of the region definition.
 	</xsd:complexType>
 	<!-- -->
 	<xsd:element name="lookup-region" type="lookupRegionType"/>
-	<!-- -->
+	<!-- Abstract Read-only Region Type -->
 	<xsd:complexType name="baseReadOnlyRegionType" abstract="true">
 		<xsd:complexContent>
 			<xsd:extension base="basicRegionType">
@@ -837,15 +999,6 @@ for the "same" Region (by name), then this can cause confusion or have unexpecte
 						]]></xsd:documentation>
 					</xsd:annotation>
 				</xsd:attribute>
-				<xsd:attribute name="ignore-jta" type="xsd:string" use="optional">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-Indicates whether operations on this Region participates in active JTA transactions or ignores them and operates
-outside of transactions.  This is primarily used in cache loaders, writers, and listeners that need to perform
-non-transactional operations on a Region, such as caching a result set.  GemFire default is false.
-								]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
 				<xsd:attribute name="initial-capacity" type="xsd:string" use="optional">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
@@ -930,7 +1083,7 @@ The name of the region definition.]]>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<!-- -->
+	<!-- Abstract Region Type -->
 	<xsd:complexType name="baseRegionType" abstract="true">
 		<xsd:complexContent>
 			<xsd:extension base="baseReadOnlyRegionType">
@@ -1028,18 +1181,13 @@ use inner bean declarations.
 						</xsd:element>
 					</xsd:choice>
 				</xsd:sequence>
-				<xsd:attribute name="enable-gateway" type="xsd:string" use="optional">
+				<xsd:attribute name="ignore-jta" type="xsd:string" use="optional">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
-Specifies if WAN Gateway communications are enabled for this Region (true or false) (Deprecated since Gemfire v 7.0)
-                                ]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="hub-id" type="xsd:string" use="optional">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-Specifies if WAN Gateway hub id if enable-gateway is true. (Deprecated since Gemfire v 7.0)
-                                ]]></xsd:documentation>
+Indicates whether operations on this Region participates in active JTA transactions or ignores them and operates
+outside of transactions.  This is primarily used in cache loaders, writers, and listeners that need to perform
+non-transactional operations on a Region, such as caching a result set.  GemFire default is false.
+								]]></xsd:documentation>
 					</xsd:annotation>
 				</xsd:attribute>
 				<xsd:attribute name="index-update-type" type="xsd:string" use="optional">
@@ -1050,6 +1198,15 @@ in a background thread.  GemFire default is synchronous.
 						]]></xsd:documentation>
 					</xsd:annotation>
 				</xsd:attribute>
+				<xsd:attribute name="off-heap" type="xsd:string" use="optional" default="false">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+Specifies that the region uses off-heap memory to store entry values, including values for region entries
+and queue entries. The region will still use heap memory for everything else, such as entry keys
+and the ConcurrentHashMap.  GemFire default is false.
+						]]></xsd:documentation>
+					</xsd:annotation>
+				</xsd:attribute>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
@@ -1075,7 +1232,7 @@ in a background thread.  GemFire default is synchronous.
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<!-- -->
+	<!-- Region Template -->
 	<xsd:element name="region-template" type="regionType">
 		<xsd:annotation>
 			<xsd:documentation source="org.springframework.data.gemfire.RegionFactoryBean"><![CDATA[
@@ -1151,7 +1308,7 @@ distributed system with the mcast-port gemfire.properties setting.
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:attributeGroup>
-	<!-- Client Region Type -->
+	<!-- Client Region -->
 	<xsd:complexType name="baseClientRegionType" abstract="true">
 		<xsd:annotation>
 			<xsd:documentation
@@ -1380,7 +1537,7 @@ Defines a GemFire Client Region
 			</xsd:appinfo>
 		</xsd:annotation>
 	</xsd:element>
-	<!-- Local Region Type -->
+	<!-- LOCAL Region -->
 	<xsd:complexType name="baseLocalRegionType" abstract="true">
 		<xsd:annotation>
 			<xsd:documentation
@@ -1502,7 +1659,7 @@ Defines a template for creating multiple GemFire Local Regions that all share a
 	</xsd:element>
 	<!-- -->
 	<xsd:element name="local-region" type="localRegionType"/>
-	<!-- Partition Region Type -->
+	<!-- PARTITION Region -->
 	<xsd:complexType name="basePartitionedRegionType" abstract="true">
 		<xsd:annotation>
 			<xsd:documentation
@@ -1787,7 +1944,7 @@ Defines a template for creating multiple GemFire PARTITION Regions that all shar
 	</xsd:element>
 	<!-- -->
 	<xsd:element name="partitioned-region" type="partitionedRegionType"/>
-	<!-- Replicate Region Type -->
+	<!-- REPLICATE Region -->
 	<xsd:complexType name="baseReplicatedRegionType" abstract="true">
 		<xsd:annotation>
 			<xsd:documentation source="org.springframework.data.gemfire.RegionFactoryBean"><![CDATA[
@@ -1940,7 +2097,7 @@ Defines a template for creating multiple GemFire REPLICATE Regions that all shar
 	</xsd:element>
 	<!-- -->
 	<xsd:element name="replicated-region" type="replicatedRegionType"/>
-	<!-- Disk Store Type -->
+	<!-- Disk Store -->
 	<xsd:complexType name="baseDiskStoreType">
 		<xsd:sequence>
 			<xsd:element name="disk-dir" minOccurs="0" maxOccurs="unbounded">
@@ -2068,8 +2225,6 @@ The name of the bean defining the GemFire cache (by default 'gemfireCache').
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<!-- -->
-	<xsd:element name="disk-store" type="diskStoreType" />
 	<!-- Eviction -->
 	<xsd:complexType name="evictionType">
 		<xsd:sequence minOccurs="0" maxOccurs="1">
@@ -2143,61 +2298,8 @@ use inner bean declarations.
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-	<!-- Functions -->
-	<xsd:element name="function-service">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="function" minOccurs="0" maxOccurs="1">
-					<xsd:annotation>
-						<xsd:documentation source="org.apache.geode.cache.execute.Function"><![CDATA[
-Declares one or more remote functions for this cache and register's with them the FunctionService. each bean
-must implement org.apache.geode.cache.execute.Function
-                            ]]></xsd:documentation>
-						<xsd:appinfo>
-							<tool:annotation>
-								<tool:exports type="org.apache.geode.cache.execute.Function" />
-							</tool:annotation>
-						</xsd:appinfo>
-					</xsd:annotation>
-					<xsd:complexType>
-						<xsd:sequence>
-							<xsd:any namespace="##other" processContents="skip"
-									 minOccurs="0" maxOccurs="unbounded">
-								<xsd:annotation>
-									<xsd:documentation><![CDATA[
-Inner bean definition of the remote function.
-                                        ]]></xsd:documentation>
-								</xsd:annotation>
-							</xsd:any>
-						</xsd:sequence>
-						<xsd:attribute name="ref" type="xsd:string" use="optional">
-							<xsd:annotation>
-								<xsd:documentation><![CDATA[
-The name of the remote function bean referred by this declaration. Used as a convenience method. If no reference exists,
-use inner bean declarations.
-                                    ]]></xsd:documentation>
-							</xsd:annotation>
-						</xsd:attribute>
-					</xsd:complexType>
-				</xsd:element>
-			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:string" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-The id of the function service (optional)
-                                    ]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-	<!-- Function Annotation support -->
-	<xsd:element name="annotation-driven">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
-	Enables gemfire annotations.
-			]]></xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
+	<!-- -->
+	<xsd:element name="disk-store" type="diskStoreType"/>
 	<!-- Index -->
 	<xsd:element name="index">
 		<xsd:annotation>
@@ -2273,142 +2375,34 @@ The type of index: FUNCTIONAL, HASH, PRIMARY_KEY.
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	<!-- JNDI -->
-	<xsd:complexType name="jndiBindingType">
-		<xsd:sequence>
-			<xsd:element name="jndi-prop" type="configPropertyType" minOccurs="0" maxOccurs="unbounded">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-Specifies a vendor-specific property
-            ]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="jndi-name" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The JNDI name for this DataSource. Will be prefixed with "java:/"
-            ]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="type" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Specifies the DataSource implementation: ManagedDataSource, PooledDataSource, SimpleDataSource, or XAPooledDataSource.
-            ]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="blocking-timeout-seconds" type="xsd:string"
-					   use="optional" />
-		<xsd:attribute name="conn-pooled-datasource-class" type="xsd:string"
-					   use="optional" />
-		<xsd:attribute name="connection-url" type="xsd:string"
-					   use="optional" />
-		<xsd:attribute name="idle-timeout-seconds" type="xsd:string"
-					   use="optional" />
-		<xsd:attribute name="init-pool-size" type="xsd:string"
-					   use="optional" />
-		<xsd:attribute name="jdbc-driver-class" type="xsd:string"
-					   use="optional" />
-		<xsd:attribute name="login-timeout-seconds" type="xsd:string"
-					   use="optional" />
-		<xsd:attribute name="managed-connection-factory-class"
-					   type="xsd:string" use="optional" />
-		<xsd:attribute name="max-pool-size" type="xsd:string"
-					   use="optional" />
-		<xsd:attribute name="password" type="xsd:string" use="optional" />
-		<xsd:attribute name="user-name" type="xsd:string" use="optional" />
-		<xsd:attribute name="xa-datasource-class" type="xsd:string"
-					   use="optional" />
-		<xsd:attribute name="transaction-type" type="xsd:string"
-					   use="optional" />
-	</xsd:complexType>
-	<!-- -->
-	<xsd:complexType name="configPropertyType" mixed="true">
-		<xsd:attribute name="key" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Specifies the property key.
-            ]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="type" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Specifies the data type if other than java.lang.String.
-            ]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-	<!-- Transaction Management (Local Cache) -->
-	<xsd:element name="transaction-manager">
+	<!-- Lucene Index & Service -->
+	<xsd:element name="lucene-index">
 		<xsd:annotation>
 			<xsd:documentation
-				source="org.springframework.data.gemfire.GemfireTransactionManager"><![CDATA[
-Defines a GemFire Transaction Manager instance for a single GemFire cache.
-			]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:string" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-The name of the transaction manager definition (by default "gemfireTransactionManager").]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="cache-ref" type="xsd:string" use="optional"
-						   default="gemfireCache">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-The name of the bean defining the GemFire cache (by default 'gemfireCache').
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="copy-on-read" type="xsd:string"
-						   use="optional" default="true">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-Indicates whether the cache returns direct references or copies of the objects (default) it manages.
-While copies imply additional work for every fetch operation, direct references can cause dirty reads
-across concurrent threads in the same VM, whether or not transactions are used.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-	<!-- Client/Server Topology -->
-	<xsd:element name="cache-server">
-		<xsd:annotation>
-			<xsd:documentation
-				source="org.springframework.data.gemfire.server.CacheServerFactoryBean"><![CDATA[
-Defines a Cache Server for feeding data to remote gemfire clients to a server GemFire Cache Servers.
-Note: In order to instantiate a cacheserver, a GemFire cache needs to be avaialble in the VM.
+				source="org.springframework.data.gemfire.search.lucene.LuceneIndexFactoryBean"><![CDATA[
+Defines a GemFire Lucene index.
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports type="org.apache.geode.cache.server.CacheServer" />
+					<tool:exports type="org.apache.geode.cache.lucene.LuceneIndex"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
 		<xsd:complexType>
-			<xsd:sequence minOccurs="0" maxOccurs="1">
-				<xsd:element name="subscription-config" minOccurs="0" maxOccurs="1">
+			<xsd:sequence>
+				<xsd:element name="field-analyzers" type="beanDeclarationType" minOccurs="0" maxOccurs="1">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
-The client subscription configuration that is used to control a clients use of server resources towards notification queues.
-				]]></xsd:documentation>
+Mapping of field names to Lucene (per field) Analyzers.
+					]]></xsd:documentation>
 					</xsd:annotation>
-					<xsd:complexType>
-						<xsd:attribute name="eviction-type" type="xsd:string" use="optional" default="NONE"/>
-						<xsd:attribute name="capacity" type="xsd:string" use="optional" default="1"/>
-						<xsd:attribute name="disk-store" type="xsd:string" use="optional"/>
-					</xsd:complexType>
 				</xsd:element>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:string" use="optional">
+			<xsd:attribute name="id" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-The name of the cache server definition (by default "gemfireServer").
-				]]></xsd:documentation>
+The name of the LuceneIndex bean definition. If property 'name' is not set, it will be used as the index name as well.
+					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 			<xsd:attribute name="cache-ref" type="xsd:string" use="optional" default="gemfireCache">
@@ -2418,153 +2412,81 @@ The name of the bean defining the GemFire cache (by default 'gemfireCache').
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="auto-startup" type="xsd:string" use="optional" default="true"/>
-			<xsd:attribute name="bind-address" type="xsd:string" use="optional" />
-			<xsd:attribute name="port" type="xsd:string" use="optional" default="40404">
+			<xsd:attribute name="name" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-The port number of the server.
+The name of the LuceneIndex.
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="host-name-for-clients" type="xsd:string" use="optional" />
-			<xsd:attribute name="load-poll-interval" type="xsd:string" use="optional" default="5000"/>
-			<xsd:attribute name="max-connections" type="xsd:string" use="optional" default="800"/>
-			<xsd:attribute name="max-threads" type="xsd:string" use="optional" default="0" />
-			<xsd:attribute name="max-message-count" type="xsd:string" use="optional" default="230000"/>
-			<xsd:attribute name="max-time-between-pings" type="xsd:string" use="optional" default="60000"/>
-			<xsd:attribute name="message-time-to-live" type="xsd:string" use="optional" default="180"/>
-			<xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" default="32768"/>
-			<xsd:attribute name="notify-by-subscription" type="xsd:string" use="optional" default="true"/>
-			<xsd:attribute name="groups" type="xsd:string" use="optional" default="">
+			<xsd:attribute name="destroy" type="xsd:string" use="optional" default="false">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-The server groups that this server will be a member of given as a comma separated values list.
-				]]></xsd:documentation>
+Determines whether the LuceneIndex is destroyed on shutdown.
+					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="load-probe-ref" type="xsd:string" use="optional">
+			<xsd:attribute name="fields" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-The name of the bean defining the CacheServer Load Probe.
+List of fields included in the Lucene Index.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="lucene-service-ref" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Reference to the single LuceneService.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="region-ref" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Reference to the Region
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="region-path" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Fully-qualified pathname of the Region.
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
 	<!-- -->
-	<xsd:element name="pool">
+	<xsd:element name="lucene-service">
 		<xsd:annotation>
 			<xsd:documentation
-				source="org.springframework.data.gemfire.client.PoolFactoryBean"><![CDATA[
-Defines a pool for connections from a client to a set of GemFire Cache Servers.
-
-Note that in order to instantiate a pool, a GemFire cache needs to be already started.
+				source="org.springframework.data.gemfire.search.lucene.LuceneServiceFactoryBean"><![CDATA[
+Defines a GemFire LuceneService bean.
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports type="org.apache.geode.cache.client.Pool" />
+					<tool:exports type="org.apache.geode.cache.lucene.LuceneService"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
 		<xsd:complexType>
-			<xsd:choice>
-				<xsd:element name="locator" type="connectionType" minOccurs="0" maxOccurs="unbounded" />
-				<xsd:element name="server" type="connectionType" minOccurs="0" maxOccurs="unbounded" />
-			</xsd:choice>
-			<xsd:attribute name="id" type="xsd:string" use="optional">
+			<xsd:attribute name="id" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-The name of the pool definition (by default "gemfirePool").
+Identifier (name) for the LuceneService bean definition.
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="free-connection-timeout" type="xsd:string" use="optional"/>
-			<xsd:attribute name="idle-timeout" type="xsd:string" use="optional"/>
-			<xsd:attribute name="load-conditioning-interval" type="xsd:string" use="optional"/>
-			<xsd:attribute name="keep-alive" type="xsd:string" use="optional" default="false"/>
-			<xsd:attribute name="locators" type="xsd:string" use="optional">
+			<xsd:attribute name="cache-ref" type="xsd:string" use="optional" default="gemfireCache">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-Comma-delimited list of Locator endpoints used by this Pool in the form of: host1[port1],host2[port2],...,hostN[portN]
+The name of the bean defining the GemFire cache (by default 'gemfireCache').
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="max-connections" type="xsd:string" use="optional"/>
-			<xsd:attribute name="min-connections" type="xsd:string" use="optional"/>
-			<xsd:attribute name="multi-user-authentication" type="xsd:string" use="optional"/>
-			<xsd:attribute name="ping-interval" type="xsd:string" use="optional"/>
-			<xsd:attribute name="pr-single-hop-enabled" type="xsd:string" use="optional"/>
-			<xsd:attribute name="read-timeout" type="xsd:string" use="optional"/>
-			<xsd:attribute name="retry-attempts" type="xsd:string" use="optional"/>
-			<xsd:attribute name="server-group" type="xsd:string" use="optional"/>
-			<xsd:attribute name="servers" type="xsd:string" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-Comma-delimited list of Server endpoints used by this Pool in the form of: host1[port1],host2[port2],...,hostN[portN]
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional"/>
-			<xsd:attribute name="statistic-interval" type="xsd:string" use="optional"/>
-			<xsd:attribute name="subscription-ack-interval" type="xsd:string" use="optional"/>
-			<xsd:attribute name="subscription-enabled" type="xsd:string" use="optional"/>
-			<xsd:attribute name="subscription-message-tracking-timeout" type="xsd:string" use="optional"/>
-			<xsd:attribute name="subscription-redundancy" type="xsd:string" use="optional"/>
-			<xsd:attribute name="thread-local-connections" type="xsd:string" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-	<!-- -->
-	<xsd:complexType name="connectionType">
-		<xsd:attribute name="host" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The host name or ip address of the connection.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="port">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The port number of the connection (between 1 and 65535 inclusive).
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:restriction base="xsd:string" />
-			</xsd:simpleType>
-		</xsd:attribute>
-	</xsd:complexType>
-	<!-- -->
-	<xsd:complexType name="interestType" abstract="true">
-		<xsd:attribute name="durable" type="xsd:string" use="optional" default="false">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Indicates whether the Registered Interest is durable or not. Default is false.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="receive-values" type="xsd:string" use="optional" default="true">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Indicates whether values are received with create and update events on keys of interest (true)
-or only invalidations are received and the value will be received on the next get instead (false).
-Default is true.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="result-policy" type="xsd:string" use="optional" default="KEYS_VALUES">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The result policy for this interest. Can be one of 'KEYS', 'KEYS_VALUES' (the default) or 'NONE'.
-
-KEYS - Initializes the local Cache with the keys satisfying the request.
-KEYS_VALUES - Initializes the local Cache with the keys and current values satisfying the request.
-NONE - Does not initialize the local Cache.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-	<!-- -->
+	<!-- CQ -->
 	<xsd:element name="cq-listener-container">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -2687,7 +2609,194 @@ Whether the resulting GemFire continuous query is durable or not.
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-	<!-- WAN Topology -->
+	<!-- Interests -->
+	<xsd:complexType name="interestType" abstract="true">
+		<xsd:attribute name="durable" type="xsd:string" use="optional" default="false">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Indicates whether the Registered Interest is durable or not. Default is false.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="receive-values" type="xsd:string" use="optional" default="true">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Indicates whether values are received with create and update events on keys of interest (true)
+or only invalidations are received and the value will be received on the next get instead (false).
+Default is true.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="result-policy" type="xsd:string" use="optional" default="KEYS_VALUES">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The result policy for this interest. Can be one of 'KEYS', 'KEYS_VALUES' (the default) or 'NONE'.
+
+KEYS - Initializes the local Cache with the keys satisfying the request.
+KEYS_VALUES - Initializes the local Cache with the keys and current values satisfying the request.
+NONE - Does not initialize the local Cache.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+	<!-- Function -->
+	<xsd:element name="function-service">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="function" minOccurs="0" maxOccurs="1">
+					<xsd:annotation>
+						<xsd:documentation source="org.apache.geode.cache.execute.Function"><![CDATA[
+Declares one or more remote functions for this cache and register's with them the FunctionService. each bean
+must implement org.apache.geode.cache.execute.Function
+                            ]]></xsd:documentation>
+						<xsd:appinfo>
+							<tool:annotation>
+								<tool:exports type="org.apache.geode.cache.execute.Function" />
+							</tool:annotation>
+						</xsd:appinfo>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:any namespace="##other" processContents="skip"
+									 minOccurs="0" maxOccurs="unbounded">
+								<xsd:annotation>
+									<xsd:documentation><![CDATA[
+Inner bean definition of the remote function.
+                                        ]]></xsd:documentation>
+								</xsd:annotation>
+							</xsd:any>
+						</xsd:sequence>
+						<xsd:attribute name="ref" type="xsd:string" use="optional">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+The name of the remote function bean referred by this declaration. Used as a convenience method. If no reference exists,
+use inner bean declarations.
+                                    ]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:attribute>
+					</xsd:complexType>
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The id of the function service (optional)
+                                    ]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+	<!-- Function Annotation Support -->
+	<xsd:element name="annotation-driven">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Enables gemfire annotations.
+			]]></xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<!-- JNDI -->
+	<xsd:complexType name="jndiBindingType">
+		<xsd:sequence>
+			<xsd:element name="jndi-prop" type="configPropertyType" minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Specifies a vendor-specific property
+            ]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="jndi-name" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The JNDI name for this DataSource. Will be prefixed with "java:/"
+            ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="type" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Specifies the DataSource implementation: ManagedDataSource, PooledDataSource, SimpleDataSource, or XAPooledDataSource.
+            ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="blocking-timeout-seconds" type="xsd:string"
+					   use="optional" />
+		<xsd:attribute name="conn-pooled-datasource-class" type="xsd:string"
+					   use="optional" />
+		<xsd:attribute name="connection-url" type="xsd:string"
+					   use="optional" />
+		<xsd:attribute name="idle-timeout-seconds" type="xsd:string"
+					   use="optional" />
+		<xsd:attribute name="init-pool-size" type="xsd:string"
+					   use="optional" />
+		<xsd:attribute name="jdbc-driver-class" type="xsd:string"
+					   use="optional" />
+		<xsd:attribute name="login-timeout-seconds" type="xsd:string"
+					   use="optional" />
+		<xsd:attribute name="managed-connection-factory-class"
+					   type="xsd:string" use="optional" />
+		<xsd:attribute name="max-pool-size" type="xsd:string"
+					   use="optional" />
+		<xsd:attribute name="password" type="xsd:string" use="optional" />
+		<xsd:attribute name="user-name" type="xsd:string" use="optional" />
+		<xsd:attribute name="xa-datasource-class" type="xsd:string"
+					   use="optional" />
+		<xsd:attribute name="transaction-type" type="xsd:string"
+					   use="optional" />
+	</xsd:complexType>
+	<!-- -->
+	<xsd:complexType name="configPropertyType" mixed="true">
+		<xsd:attribute name="key" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Specifies the property key.
+            ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="type" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Specifies the data type if other than java.lang.String.
+            ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+	<!-- Transaction Management -->
+	<xsd:element name="transaction-manager">
+		<xsd:annotation>
+			<xsd:documentation
+				source="org.springframework.data.gemfire.GemfireTransactionManager"><![CDATA[
+Defines a GemFire Transaction Manager instance for a single GemFire cache.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the transaction manager definition (by default "gemfireTransactionManager").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="cache-ref" type="xsd:string" use="optional"
+						   default="gemfireCache">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the bean defining the GemFire cache (by default 'gemfireCache').
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="copy-on-read" type="xsd:string"
+						   use="optional" default="true">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Indicates whether the cache returns direct references or copies of the objects (default) it manages.
+While copies imply additional work for every fetch operation, direct references can cause dirty reads
+across concurrent threads in the same VM, whether or not transactions are used.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+	<!-- WAN -->
 	<xsd:attributeGroup name="commonWANQueueAttributes">
 		<xsd:attribute name="batch-conflation-enabled" type="xsd:string" use="optional">
 			<xsd:annotation>
@@ -2779,7 +2888,7 @@ Boolean value that determines whether GemFire persists the Gateway Queue or Asyn
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:attributeGroup>
-	<!-- -->
+	<!-- AEQ -->
 	<xsd:complexType name="baseAsyncEventQueueType">
 		<xsd:annotation>
 			<xsd:documentation source="org.apache.geode.cache.wan.AsyncEventQueue"><![CDATA[
@@ -2834,6 +2943,7 @@ if an inner bean.
                   ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
+		<xsd:attribute name="forward-expiration-destroy" type="xsd:string" default="false" use="optional"/>
 		<xsd:attributeGroup ref="commonWANQueueAttributes" />
 	</xsd:complexType>
 	<!-- -->
@@ -2860,7 +2970,7 @@ The id of the cache - default is gemfireCache
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
-	<!-- -->
+	<!-- Gateway Receiver -->
 	<xsd:complexType name="baseGatewayReceiverType">
 		<xsd:annotation>
 			<xsd:documentation source="org.apache.geode.cache.wan.GatewayReceiver"><![CDATA[
@@ -2944,8 +3054,8 @@ Specifies the socket buffer size in bytes
 		</xsd:attribute>
 	</xsd:complexType>
 	<!-- -->
-	<xsd:element name="gateway-receiver" type="baseGatewayReceiverType" />
-	<!-- -->
+	<xsd:element name="gateway-receiver" type="baseGatewayReceiverType"/>
+	<!-- Gateway Sender -->
 	<xsd:complexType name="baseGatewaySenderType">
 		<xsd:annotation>
 			<xsd:documentation source="org.apache.geode.cache.wan.GatewaySender"><![CDATA[