diff --git a/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java
index 7a7ea4eb..f81c2909 100644
--- a/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java
@@ -17,6 +17,7 @@
 package org.springframework.data.gemfire;
 
 import java.lang.reflect.Field;
+import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -28,6 +29,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;
 
 import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.AttributesMutator;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.cache.CacheListener;
@@ -64,6 +66,7 @@ public class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> imple
 	private Scope scope;
 	private DataPolicy dataPolicy;
 	private Region<K, V> region;
+	private List<Region<?, ?>> subRegions;
 
 
 	@Override
@@ -73,7 +76,6 @@ public class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> imple
 		postProcess(region);
 	}
 
-
 	@Override
 	protected Region<K, V> lookupFallback(GemFireCache cache, String regionName) throws Exception {
 		Assert.isTrue(cache instanceof Cache, "Unable to create regions from " + cache);
@@ -85,6 +87,7 @@ public class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> imple
 
 		final RegionFactory<K, V> regionFactory = (attributes != null ? c.createRegionFactory(attributes)
 				: c.<K, V> createRegionFactory());
+		
 
 		if (!ObjectUtils.isEmpty(cacheListeners)) {
 			for (CacheListener<K, V> listener : cacheListeners) {
@@ -110,12 +113,16 @@ public class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> imple
 
 		// get underlying AttributesFactory
 		postProcess(findAttrFactory(regionFactory));
-
+        
 		Region<K, V> reg = regionFactory.create(regionName);
 		log.info("Created new cache region [" + regionName + "]");
 		if (snapshot != null) {
 			reg.loadSnapshot(snapshot.getInputStream());
 		}
+		
+		if (subRegions != null) {
+			System.out.println("**********************************************" + subRegions.get(0));
+		}
 
 		return reg;
 	}
@@ -225,6 +232,12 @@ public class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> imple
 		this.cacheListeners = cacheListeners;
 	}
 
+	public void setSubRegions(List<Region<?, ?>> subRegions) {
+		log.info("setting subRegions");
+		this.subRegions = subRegions;
+	}
+
+
 	/**
 	 * Sets the cache loader used for the region used by this factory.
 	 * Used only when a new region is created.Overrides the settings
diff --git a/src/main/java/org/springframework/data/gemfire/SubRegion.java b/src/main/java/org/springframework/data/gemfire/SubRegion.java
new file mode 100644
index 00000000..dbb1b68b
--- /dev/null
+++ b/src/main/java/org/springframework/data/gemfire/SubRegion.java
@@ -0,0 +1,37 @@
+package org.springframework.data.gemfire;
+
+import java.util.List;
+
+import com.gemstone.gemfire.cache.RegionAttributes;
+/**
+ * 
+ * @author David Turanski
+ *
+ * @param <K>
+ * @param <V>
+ */
+public class SubRegion<K, V> {
+	private final RegionAttributes<K, V> regionAttributes;
+	private final String regionName;
+	private List<SubRegion<?,?>> subRegions;
+	
+	public SubRegion(String regionName, RegionAttributes<K, V> regionAttributes) {
+		this.regionAttributes = regionAttributes;
+		this.regionName = regionName;
+	}
+	
+	public RegionAttributes<K, V> getRegionAttributes() {
+		return regionAttributes;
+	}
+	 
+	public String getRegionName() {
+		return regionName;
+	}
+	
+	public List<SubRegion<?, ?>> getSubRegions() {
+		return subRegions;
+	}
+	public void setSubRegions(List<SubRegion<?, ?>> subRegions) {
+		this.subRegions = subRegions;
+	} 
+}
diff --git a/src/main/java/org/springframework/data/gemfire/SubRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/SubRegionFactoryBean.java
new file mode 100644
index 00000000..5c1104dc
--- /dev/null
+++ b/src/main/java/org/springframework/data/gemfire/SubRegionFactoryBean.java
@@ -0,0 +1,47 @@
+package org.springframework.data.gemfire;
+
+import java.util.List;
+
+import org.springframework.beans.factory.BeanNameAware;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+
+public class SubRegionFactoryBean<K,V> extends AttributesFactory<K,V> implements FactoryBean<SubRegion<K, V>>, InitializingBean {
+	private String name;
+	private SubRegion<K,V> subRegion;
+	private String regionName;
+	private List<SubRegion<?,?>> subRegions;
+
+	
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public void setSubRegions(List<SubRegion<?, ?>> subRegions) {
+		this.subRegions = subRegions;
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {	
+		this.subRegion = new SubRegion<K,V>(name,create());
+		this.subRegion.setSubRegions(this.subRegions);
+	}
+
+	@Override
+	public SubRegion<K, V> getObject() throws Exception {
+		return this.subRegion;
+	}
+
+	@Override
+	public Class<?> getObjectType() {
+		return SubRegion.class;
+	}
+
+	@Override
+	public boolean isSingleton() {
+		return true;
+	}
+
+}
diff --git a/src/main/java/org/springframework/data/gemfire/config/AliasReplacingBeanDefinitionParser.java b/src/main/java/org/springframework/data/gemfire/config/AliasReplacingBeanDefinitionParser.java
index 1184a87c..2ef4259c 100644
--- a/src/main/java/org/springframework/data/gemfire/config/AliasReplacingBeanDefinitionParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/AliasReplacingBeanDefinitionParser.java
@@ -21,6 +21,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.gemfire.RegionFactoryBean;
+import org.springframework.data.gemfire.SubRegionFactoryBean;
 import org.w3c.dom.Element;
 
 /**
@@ -32,10 +34,20 @@ import org.w3c.dom.Element;
  */
 abstract class AliasReplacingBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
 
+	protected Class<?> getBeanClass(Element element) {
+		if (element.hasAttribute("subregion")){
+			System.out.println("building subregion " + element.getAttribute(NAME_ATTRIBUTE));
+			return SubRegionFactoryBean.class;
+		} else {
+			return RegionFactoryBean.class;
+		}
+	}
+
 	@Override
 	protected final void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+		
 		ParsingUtils.addBeanAliasAsMetadata(element, builder);
-
+		
 		doParseInternal(element, parserContext, builder);
 	}
 
diff --git a/src/main/java/org/springframework/data/gemfire/config/ReplicatedRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/ReplicatedRegionParser.java
index 13df6b7e..d1e85e3d 100644
--- a/src/main/java/org/springframework/data/gemfire/config/ReplicatedRegionParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/ReplicatedRegionParser.java
@@ -18,10 +18,15 @@ package org.springframework.data.gemfire.config;
 
 import java.util.List;
 
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.gemfire.RegionAttributesFactoryBean;
-import org.springframework.data.gemfire.RegionFactoryBean;
+import org.springframework.data.gemfire.SubRegion;
+import org.springframework.data.gemfire.SubRegionFactoryBean;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
@@ -36,14 +41,15 @@ import com.gemstone.gemfire.cache.Scope;
  */
 class ReplicatedRegionParser extends AliasReplacingBeanDefinitionParser {
 
-	protected Class<?> getBeanClass(Element element) {
-		return RegionFactoryBean.class;
-	}
 
 	@Override
 	protected void doParseInternal(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
 		super.doParse(element, builder);
+		System.out.println("building class " +
+		builder.getBeanDefinition().getBeanClassName());
 
+		boolean subRegion = element.hasAttribute("subregion");
+	
 		// set the data policy
 		String attr = element.getAttribute("persistent");
 		if (Boolean.parseBoolean(attr)) {
@@ -57,12 +63,15 @@ class ReplicatedRegionParser extends AliasReplacingBeanDefinitionParser {
 
 		ParsingUtils.setPropertyValue(element, builder, "name", "name");
 
-		attr = element.getAttribute("cache-ref");
-		// add cache reference (fallback to default if nothing is specified)
-		builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "gemfire-cache"));
-
+		BeanDefinitionBuilder attrBuilder = builder;
+		
+		if (!subRegion){
+			attr = element.getAttribute("cache-ref");
+			// add cache reference (fallback to default if nothing is specified)
+			builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "gemfire-cache"));
+			attrBuilder = BeanDefinitionBuilder.genericBeanDefinition(RegionAttributesFactoryBean.class);
+		}
 		// add attributes
-		BeanDefinitionBuilder attrBuilder = BeanDefinitionBuilder.genericBeanDefinition(RegionAttributesFactoryBean.class);
 
 		ParsingUtils.parseStatistics(element, attrBuilder);
 
@@ -79,7 +88,10 @@ class ReplicatedRegionParser extends AliasReplacingBeanDefinitionParser {
 
 		List<Element> subElements = DomUtils.getChildElements(element);
 
-		// parse nested cache-listener elements
+		ManagedList subRegions = new ManagedList();
+		subRegions.setElementTypeName(SubRegionFactoryBean.class.getName());
+		 
+		// parse nested elements
 		for (Element subElement : subElements) {
 			String name = subElement.getLocalName();
 
@@ -94,6 +106,22 @@ class ReplicatedRegionParser extends AliasReplacingBeanDefinitionParser {
 			else if ("cache-writer".equals(name)) {
 				builder.addPropertyValue("cacheWriter", parseCacheWriter(parserContext, subElement, builder));
 			}
+			//subregion
+			else if (name.endsWith("region")){
+				System.out.println("element type:" + subElement.getSchemaTypeInfo().getTypeName());
+				String parentRegionName = StringUtils.hasLength(element.getAttribute(NAME_ATTRIBUTE))? element.getAttribute(NAME_ATTRIBUTE):
+					element.getAttribute(ID_ATTRIBUTE);
+				
+			
+				
+				BeanDefinition subRegionDef = this.parseSubRegion(subElement, parserContext, parentRegionName,builder.getBeanDefinition());
+				subRegions.add(subRegionDef);
+				System.out.println("parsed subregion " + subRegionDef);
+			}
+		}
+		
+		if (!CollectionUtils.isEmpty(subRegions)) {
+			builder.addPropertyValue("subRegions", subRegions);
 		}
 	}
 
@@ -108,4 +136,11 @@ class ReplicatedRegionParser extends AliasReplacingBeanDefinitionParser {
 	private Object parseCacheWriter(ParserContext parserContext, Element subElement, BeanDefinitionBuilder builder) {
 		return ParsingUtils.parseRefOrNestedBeanDeclaration(parserContext, subElement, builder);
 	}
+
+	private BeanDefinition parseSubRegion(Element element, ParserContext parserContext, String parentRegionName,
+			BeanDefinition parentDefinition) {
+		element.setAttribute("subregion", "true");
+		BeanDefinition beanDefinition = parserContext.getDelegate().parseCustomElement(element, parentDefinition);
+		return beanDefinition;
+	}
 }
\ No newline at end of file
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.2.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.2.xsd
index 60797d8d..a7f4fd02 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.2.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.2.xsd
@@ -1,27 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns="http://www.springframework.org/schema/gemfire"
-            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:repository="http://www.springframework.org/schema/data/repository"
-            targetNamespace="http://www.springframework.org/schema/gemfire"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified"
-            version="1.2">
-
-    <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/data/repository"
-                schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd"/>
-
-    <xsd:annotation>
-        <xsd:documentation><![CDATA[
+<xsd:schema xmlns="http://www.springframework.org/schema/gemfire" 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:repository="http://www.springframework.org/schema/data/repository" targetNamespace="http://www.springframework.org/schema/gemfire" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2">
+	<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/data/repository" schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd"/>
+	<!-- -->
+	<xsd:annotation>
+		<xsd:documentation><![CDATA[
             Namespace support for the Spring GemFire project.
         ]]></xsd:documentation>
-    </xsd:annotation>
-    
-    
-   	<xsd:complexType name="cacheType">
+	</xsd:annotation>
+	<!-- -->
+	<xsd:complexType name="cacheBaseType">
 		<xsd:attribute name="id" type="xsd:ID" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -44,7 +33,7 @@ consider using a dedicated utility such as the <util:*/> namespace and its 'prop
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="use-bean-factory-locator" type="xsd:string" default="true" use="optional">
+		<xsd:attribute name="use-bean-factory-locator" type="xsd:string" use="optional" default="true">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 Indicates whether a bean factory locator is enabled (default) for this cache definition or not. The locator stores
@@ -60,7 +49,7 @@ Sets the PDX serializer for the cache. If this serializer is set, it will be con
 domain classes which are added to the cache in portable data exchange format. 				
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="pdx-disk-store" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -69,7 +58,7 @@ the type definitions are persisted to disk. This setting controls which disk sto
 If not set, the metadata will go in the default disk store. 
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="pdx-persistent" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -77,7 +66,7 @@ Control whether the type metadata for PDX objects is persisted to disk. The defa
 If you are using a WAN gateway, or persistent regions, you should leave this set to true.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="pdx-read-serialized" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -91,7 +80,7 @@ Note that a PdxInstance is only returned if a serialized PDX is found in the cac
 then a domain class instance is returned instead of a PdxInstance. 				
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="pdx-ignore-unread-fields" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -103,22 +92,79 @@ You should only set this attribute to true if you know this member will only be
 do not need to pay the cost of preserving the unread fields since you will never be reserializing pdx data. 				
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 	</xsd:complexType>
-    
-    <xsd:element name="cache" type="cacheType">
+	<!-- -->
+	<xsd:element name="cache">
 		<xsd:annotation>
 			<xsd:documentation source="org.springframework.data.gemfire.CacheFactoryBean"><![CDATA[
 Defines a GemFire Cache instance used for creating or retrieving 'regions'.
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.Cache" />
+					<tool:exports type="com.gemstone.gemfire.cache.Cache"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="cacheBaseType">
+					<xsd:sequence>
+						<xsd:element name="jndi-bindings" minOccurs="0" maxOccurs="1">
+							<xsd:complexType>
+								<xsd:sequence>
+									<xsd:element name="jndi-binding" type="jndiBindingType" minOccurs="1" maxOccurs="unbounded"/>
+								</xsd:sequence>
+							</xsd:complexType>
+						</xsd:element>
+					</xsd:sequence>
+					<xsd:attribute name="copy-on-read" type="xsd:string" use="optional" default="false">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+Controls whether entry value retrieval methods return direct references to the entry value objects in the cache (false) 
+or copies of the objects (true).           
+                ]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="lock-timeout" type="xsd:string" use="optional" default="60">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+The timeout, in seconds, for implicit object lock requests. This setting affects automatic locking only,
+ and does not apply to manual locking. If a lock request does not return before the specified timeout period,
+  it is cancelled and returns with a failure.
+                  ]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="lock-lease" type="xsd:string" use="optional" default="120">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+The timeout, in seconds, for implicit and explicit object lock leases. This affects both automatic locking and manual locking.
+Once a lock is obtained, it can remain in force for the lock lease time period before being automatically cleared by the system
+                ]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="message-sync-interval" type="xsd:string" use="optional" default="1">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+Used for client subscription queue synchronization when this member acts as a server to clients and server redundancy is used.
+Sets the frequency (in seconds) at which the primary server sends messages to its secondary servers to remove queued events
+that have already been processed by the clients.
+                ]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="search-timeout" type="xsd:string" use="optional" default="300">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+How many seconds a netSearch operation can wait for data before timing out.
+You may want to change this based on your knowledge of the network load or other factors.
+                ]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
 	</xsd:element>
-	
+	<!-- -->
 	<xsd:element name="client-cache">
 		<xsd:annotation>
 			<xsd:documentation source="org.springframework.data.gemfire.client.ClientCacheFactoryBean"><![CDATA[
@@ -126,14 +172,14 @@ Defines a GemFire Client Cache instance used for creating or retrieving 'regions
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.client.ClientCache" />
+					<tool:exports type="com.gemstone.gemfire.cache.client.ClientCache"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:complexContent>
-				<xsd:extension base="cacheType">
-					<xsd:attribute name="pool-name" use="optional" type="xsd:string">
+				<xsd:extension base="cacheBaseType">
+					<xsd:attribute name="pool-name" type="xsd:string" use="optional">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
 The name of the pool used by this client.
@@ -144,7 +190,7 @@ The name of the pool used by this client.
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
-
+	<!-- -->
 	<xsd:element name="transaction-manager">
 		<xsd:annotation>
 			<xsd:documentation source="org.springframework.data.gemfire.GemfireTransactionManager"><![CDATA[
@@ -158,14 +204,14 @@ Defines a GemFire Transaction Manager instance for a single GemFire cache.
 The name of the transaction manager definition (by default "gemfire-transaction-manager").]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="cache-ref" type="xsd:string" default="gemfire-cache" use="optional">
+			<xsd:attribute name="cache-ref" type="xsd:string" use="optional" default="gemfire-cache">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 The name of the bean defining the GemFire cache (by default 'gemfire-cache').
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="copy-on-read" type="xsd:string" default="true" use="optional">
+			<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.
@@ -173,21 +219,20 @@ While copies imply additional work for every fetch operation, direct references
 across concurrent threads in the same VM, whether or not transactions are used.
 					]]></xsd:documentation>
 				</xsd:annotation>
-			</xsd:attribute> 
+			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
 	<!-- nested bean definition -->
 	<xsd:complexType name="beanDeclarationType">
 		<xsd:sequence>
-			<xsd:any namespace="##other" minOccurs="0" maxOccurs="1" processContents="skip">
-    			<xsd:annotation>
-         			<xsd:documentation><![CDATA[
+			<xsd:any namespace="##other" processContents="skip" minOccurs="0" maxOccurs="1">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
 Inner bean definition. The nested declaration serves as an alternative to bean references (using 
 both in the same definition) is illegal.
 					]]></xsd:documentation>
 				</xsd:annotation>
-         	</xsd:any>						
+			</xsd:any>
 		</xsd:sequence>
 		<xsd:attribute name="ref" type="xsd:string" use="optional">
 			<xsd:annotation>
@@ -197,22 +242,16 @@ The name of the bean referred by this declaration. If no reference exists, use a
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-	
+	<!-- -->
 	<xsd:complexType name="basicRegionType">
 		<xsd:annotation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.Region" />
+					<tool:exports type="com.gemstone.gemfire.cache.Region"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The id of the region bean definition.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
+	
 		<xsd:attribute name="name" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -220,17 +259,9 @@ The name of the region definition. If no specified, it will have the value of th
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="cache-ref" type="xsd:string" default="gemfire-cache" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The name of the bean defining the GemFire cache (by default 'gemfire-cache').
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute> 
-	</xsd:complexType> 
-	
-	
-	<xsd:complexType name="readOnlyRegionType" abstract="true">
+	</xsd:complexType>
+	<!-- -->
+	<xsd:complexType name="readOnlySubRegionType" abstract="true">
 		<xsd:complexContent>
 			<xsd:extension base="basicRegionType">
 				<xsd:sequence>
@@ -252,13 +283,13 @@ other thread for accessing the region and not waiting for it to complete its tas
 						</xsd:annotation>
 						<xsd:complexType>
 							<xsd:sequence>
-								<xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="skip">
-					    			<xsd:annotation>
-					         			<xsd:documentation><![CDATA[
+								<xsd:any namespace="##other" processContents="skip" minOccurs="0" maxOccurs="unbounded">
+									<xsd:annotation>
+										<xsd:documentation><![CDATA[
 Inner bean definition of the cache listener.
 										]]></xsd:documentation>
 									</xsd:annotation>
-					         	</xsd:any>						
+								</xsd:any>
 							</xsd:sequence>
 							<xsd:attribute name="ref" type="xsd:string" use="optional">
 								<xsd:annotation>
@@ -276,7 +307,7 @@ use inner bean declarations.
 Disk storage configuration for the defined region.
 							]]></xsd:documentation>
 						</xsd:annotation>
-					</xsd:element>							
+					</xsd:element>
 				</xsd:sequence>
 				<xsd:attribute name="persistent" type="xsd:string" default="false">
 					<xsd:annotation>
@@ -329,12 +360,20 @@ Default is false, meaning statistics are disabled.
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	
-	<xsd:complexType name="regionType">
+	<!-- -->
+	<xsd:complexType name="readOnlyRegionType">
 		<xsd:complexContent>
-			<xsd:extension base="readOnlyRegionType">
+			<xsd:extension base="readOnlySubRegionType">
+				<xsd:attributeGroup ref="topLevelRegionAttributes"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<!-- -->
+	<xsd:complexType name="subRegionType">
+		<xsd:complexContent>
+			<xsd:extension base="readOnlySubRegionType">
 				<xsd:sequence minOccurs="0" maxOccurs="1">
-					<xsd:element name="cache-loader" minOccurs="0"  maxOccurs="1" type="beanDeclarationType">
+					<xsd:element name="cache-loader" type="beanDeclarationType" minOccurs="0" maxOccurs="1">
 						<xsd:annotation>
 							<xsd:documentation source="com.gemstone.gemfire.cache.CacheLoader"><![CDATA[
 The cache loader definition for this region. A cache loader allows data to be placed into a region.
@@ -346,7 +385,7 @@ The cache loader definition for this region. A cache loader allows data to be pl
 							</xsd:appinfo>
 						</xsd:annotation>
 					</xsd:element>
-					<xsd:element name="cache-writer" minOccurs="0" maxOccurs="1" type="beanDeclarationType">
+					<xsd:element name="cache-writer" type="beanDeclarationType" minOccurs="0" maxOccurs="1">
 						<xsd:annotation>
 							<xsd:documentation source="com.gemstone.gemfire.cache.CacheWriter"><![CDATA[
 The cache writer definition for this region. A cache writer acts as a dedicated synchronous listener that is notified
@@ -362,29 +401,28 @@ arbitrarily pick one.
 							</xsd:appinfo>
 						</xsd:annotation>
 					</xsd:element>
-					
-					<xsd:element name="region-ttl" minOccurs="0" maxOccurs="1" type="expirationType">
+					<xsd:element name="region-ttl" type="expirationType" minOccurs="0" maxOccurs="1">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[[
 Time to live configuration for the region itself. Default: no expiration.
 							]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
-					<xsd:element name="region-tti" minOccurs="0" maxOccurs="1" type="expirationType">
+					<xsd:element name="region-tti" type="expirationType" minOccurs="0" maxOccurs="1">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[[
 Time to idle (or idle timeout) configuration for the region itself. Default: no expiration.
 							]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
-					<xsd:element name="entry-ttl" minOccurs="0" maxOccurs="1" type="expirationType">
+					<xsd:element name="entry-ttl" type="expirationType" minOccurs="0" maxOccurs="1">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[[
 Time to live configuration for the region entries. Default: no expiration.
 							]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
-					<xsd:element name="entry-tti" minOccurs="0" maxOccurs="1" type="expirationType">
+					<xsd:element name="entry-tti" type="expirationType" minOccurs="0" maxOccurs="1">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[[
 Time to idle (or idle timeout) configuration for the region entries. Default: no expiration.
@@ -395,8 +433,17 @@ Time to idle (or idle timeout) configuration for the region entries. Default: no
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	
-	<xsd:element name="lookup-region" type="basicRegionType">
+	<!-- -->
+	<xsd:complexType name="regionType">
+		<xsd:complexContent>
+			<xsd:extension base="subRegionType">
+				<xsd:group ref="subRegionGroup" minOccurs="0" maxOccurs="unbounded"/>
+				<xsd:attributeGroup ref="topLevelRegionAttributes"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<!-- -->
+	<xsd:complexType name="lookupRegionType">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[[
 Looks up an existing, working, GemFire region. Typically regions are defined through GemFire own configuration, the 
@@ -405,52 +452,94 @@ cache.xml. If the region does not exist, an exception will be thrown.
 For defining regions, consider the region elements.
 			]]></xsd:documentation>
 		</xsd:annotation>
-	</xsd:element>
-	
-	<xsd:element name="replicated-region">
+		<xsd:complexContent>
+			<xsd:extension base="basicRegionType">
+				<xsd:group ref="subRegionGroup" minOccurs="0" maxOccurs="unbounded"/>
+				<xsd:attributeGroup ref="topLevelRegionAttributes"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<!-- -->
+	<xsd:group name="subRegionGroup">
+		<xsd:choice>
+			<xsd:element name="lookup-region" type="basicRegionType"/>
+			<xsd:element name="replicated-region" type="replicatedSubRegionType"/>
+			<xsd:element name="partitioned-region" type="partitionedSubRegionType"/>
+		</xsd:choice>
+	</xsd:group>
+	<!-- -->
+	<xsd:attributeGroup name="topLevelRegionAttributes">
+		<xsd:attribute name="id" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The id of the region bean definition.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cache-ref" type="xsd:string" use="optional" default="gemfire-cache">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of the bean defining the GemFire cache (by default 'gemfire-cache').
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:attributeGroup>
+	<!-- -->
+	<xsd:element name="lookup-region" type="lookupRegionType"/>
+	<!-- -->	
+	<xsd:complexType name="replicatedSubRegionType">
 		<xsd:annotation>
 			<xsd:documentation source="org.springframework.data.gemfire.RegionFactoryBean"><![CDATA[
 Defines a GemFire replicated region instance. Each replicated region contains a complete copy of the data.
 As well as high availability, replication provides excellent performance as each region contains a complete,
 up to date copy of the data.
-			]]></xsd:documentation>
+            ]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.Region" />
+					<tool:exports type="com.gemstone.gemfire.cache.Region"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="regionType">
-					<xsd:sequence minOccurs="1" maxOccurs="1">
-						<xsd:element name="eviction" minOccurs="0" maxOccurs="1">
-							<xsd:annotation>
-								<xsd:documentation><![CDATA[
+		<xsd:complexContent>
+			<xsd:extension base="subRegionType">
+				<xsd:sequence minOccurs="1" maxOccurs="1">
+					<xsd:element name="eviction" minOccurs="0" maxOccurs="1">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
 Eviction policy for the replicated region.
-								]]></xsd:documentation>
-							</xsd:annotation>
-							<xsd:complexType>
-								<xsd:complexContent>
-									<xsd:extension base="evictionType">
-										<xsd:attribute name="action" type="evictionActionType" fixed="OVERFLOW_TO_DISK">
-											<xsd:annotation>
-												<xsd:documentation><![CDATA[
+                                ]]></xsd:documentation>
+						</xsd:annotation>
+						<xsd:complexType>
+							<xsd:complexContent>
+								<xsd:extension base="evictionType">
+									<xsd:attribute name="action" type="evictionActionType" fixed="OVERFLOW_TO_DISK">
+										<xsd:annotation>
+											<xsd:documentation><![CDATA[
 The action to take when performing eviction.
-												]]></xsd:documentation>
-											</xsd:annotation>
-										</xsd:attribute>
-									</xsd:extension>
-								</xsd:complexContent>
-							</xsd:complexType>
-						</xsd:element>
-					</xsd:sequence>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="partitioned-region">
+                                                ]]></xsd:documentation>
+										</xsd:annotation>
+									</xsd:attribute>
+								</xsd:extension>
+							</xsd:complexContent>
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<!-- -->
+	<xsd:complexType name="replicatedRegionType">
+		<xsd:complexContent>
+			<xsd:extension base="replicatedSubRegionType">
+				<xsd:group ref="subRegionGroup" minOccurs="0" maxOccurs="unbounded"/>
+				<xsd:attributeGroup ref="topLevelRegionAttributes"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+<!-- -->
+	<xsd:element name="replicated-region" type="replicatedRegionType"/>
+<!-- -->
+	<xsd:complexType name="partitionedSubRegionType">
 		<xsd:annotation>
 			<xsd:documentation source="org.springframework.data.gemfire.RegionFactoryBean"><![CDATA[
 Defines a GemFire partitioned region instance. Through partitioning, the data is split across regions.
@@ -460,89 +549,88 @@ in different members, for high availability in case of an application failure.
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.Region" />
+					<tool:exports type="com.gemstone.gemfire.cache.Region"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="regionType">
-					<xsd:sequence>
-						<xsd:element name="partition-resolver" minOccurs="0" maxOccurs="1" type="beanDeclarationType">
-							<xsd:annotation>
-								<xsd:documentation source="com.gemstone.gemfire.cache.PartitionResolver"><![CDATA[
+		<xsd:complexContent>
+			<xsd:extension base="subRegionType">
+				<xsd:sequence>
+					<xsd:element name="partition-resolver" type="beanDeclarationType" minOccurs="0" maxOccurs="1">
+						<xsd:annotation>
+							<xsd:documentation source="com.gemstone.gemfire.cache.PartitionResolver"><![CDATA[
 The partition resolver definition for this region, allowing for custom partitioning. GemFire uses the resolver to
 colocate data based on custom criterias (such as colocating trades by month and year).
 								]]></xsd:documentation>
-								<xsd:appinfo>
-									<tool:annotation>
-										<tool:exports type="com.gemstone.gemfire.cache.PartitionResolver"/>
-									</tool:annotation>
-								</xsd:appinfo>
-							</xsd:annotation>
-						</xsd:element>
-						<xsd:element name="eviction" minOccurs="0" maxOccurs="1">
-							<xsd:annotation>
-								<xsd:documentation><![CDATA[
-Eviction policy for the partitioned region.
-								]]></xsd:documentation>
-							</xsd:annotation>
-							<xsd:complexType>
-								<xsd:complexContent>
-									<xsd:extension base="evictionType">
-										<xsd:attribute name="action" type="evictionActionType" default="LOCAL_DESTROY">
-											<xsd:annotation>
-												<xsd:documentation><![CDATA[
-The action to take when performing eviction.
-												]]></xsd:documentation>
-											</xsd:annotation>
-										</xsd:attribute>
-									</xsd:extension>
-								</xsd:complexContent>
-							</xsd:complexType>
-						</xsd:element>
-					</xsd:sequence>
-					<xsd:attribute name="copies" default="0" use="optional">
+							<xsd:appinfo>
+								<tool:annotation>
+									<tool:exports type="com.gemstone.gemfire.cache.PartitionResolver"/>
+								</tool:annotation>
+							</xsd:appinfo>
+						</xsd:annotation>
+					</xsd:element>
+					<xsd:element name="eviction" minOccurs="0" maxOccurs="1">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
+Eviction policy for the partitioned region.
+								]]></xsd:documentation>
+						</xsd:annotation>
+						<xsd:complexType>
+							<xsd:complexContent>
+								<xsd:extension base="evictionType">
+									<xsd:attribute name="action" type="evictionActionType" default="LOCAL_DESTROY">
+										<xsd:annotation>
+											<xsd:documentation><![CDATA[
+The action to take when performing eviction.
+												]]></xsd:documentation>
+										</xsd:annotation>
+									</xsd:attribute>
+								</xsd:extension>
+							</xsd:complexContent>
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:sequence>
+				<xsd:attribute name="copies" use="optional" default="0">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 The number of copies for each partition for high-availability. By default, no copies are created meaning there is no
 redundancy. Each copy provides extra backup at the expense of extra storages.
 						]]></xsd:documentation>
-						</xsd:annotation>
-						<xsd:simpleType>
-							<xsd:restriction base="xsd:byte">
-								<xsd:minInclusive value="0"/>
-								<xsd:maxInclusive value="3"/>
-							</xsd:restriction>
-						</xsd:simpleType>
-					</xsd:attribute>
-					<xsd:attribute name="colocated-with" type="xsd:string" use="optional">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+					</xsd:annotation>
+					<xsd:simpleType>
+						<xsd:restriction base="xsd:byte">
+							<xsd:minInclusive value="0"/>
+							<xsd:maxInclusive value="3"/>
+						</xsd:restriction>
+					</xsd:simpleType>
+				</xsd:attribute>
+				<xsd:attribute name="colocated-with" type="xsd:string" use="optional">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 The name of the partitioned region with which this newly created partitioned region is colocated.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="local-max-memory" type="xsd:string" use="optional">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+					</xsd:annotation>
+				</xsd:attribute>
+				<xsd:attribute name="local-max-memory" type="xsd:string" use="optional">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 The maximum amount of memory, in megabytes, to be used by the region in this process. If not set, a default of 90%
 of available heap is used.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="total-max-memory" type="xsd:string" use="optional">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+					</xsd:annotation>
+				</xsd:attribute>
+				<xsd:attribute name="total-max-memory" type="xsd:string" use="optional">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 The maximum amount of memory, in megabytes, to be used by the region in all process.
 
 Note: This setting must be the same in all processes using the region.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="total-buckets" type="xsd:string" use="optional">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+					</xsd:annotation>
+				</xsd:attribute>
+				<xsd:attribute name="total-buckets" type="xsd:string" use="optional">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 The total number of hash buckets to be used by the region in all processes. 
 
 A bucket is the smallest unit of data management in a partitioned region. Entries are stored in buckets and buckets may
@@ -553,29 +641,39 @@ The number of buckets should be prime and as a rough guide at the least four tim
  
 Note: This setting must be the same in all processes using the region.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="recovery-delay" type="xsd:string" default="-1" use="optional">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+					</xsd:annotation>
+				</xsd:attribute>
+				<xsd:attribute name="recovery-delay" type="xsd:string" use="optional" default="-1">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 The delay in milliseconds that existing members will wait before satisfying redundancy after another member crashes.
 -1 (the default) indicates that redundancy will not be recovered after a failure.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="startup-recovery-delay" type="xsd:string" default="-1" use="optional">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+					</xsd:annotation>
+				</xsd:attribute>
+				<xsd:attribute name="startup-recovery-delay" type="xsd:string" use="optional" default="-1">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 The delay in milliseconds that new members will wait before satisfying redundancy. -1 indicates that adding new members
  will not trigger redundancy recovery. The default is to recover redundancy immediately when a new member is added.
  							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-	
+					</xsd:annotation>
+				</xsd:attribute>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+<!-- -->	
+	<xsd:complexType name="partitionedRegionType">
+		<xsd:complexContent>
+			<xsd:extension base="partitionedSubRegionType">
+				<xsd:group ref="subRegionGroup" minOccurs="0" maxOccurs="unbounded"/>
+				<xsd:attributeGroup ref="topLevelRegionAttributes"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+<!-- -->	
+	<xsd:element name="partitioned-region" type="partitionedRegionType"/>
+<!-- -->
 	<xsd:complexType name="expirationType">
 		<xsd:attribute name="timeout" type="xsd:string" default="0">
 			<xsd:annotation>
@@ -619,7 +717,7 @@ When the region or cached object expires, it is destroyed locally only. Not supp
 			</xsd:simpleType>
 		</xsd:attribute>
 	</xsd:complexType>
-	
+<!-- -->
 	<xsd:complexType name="evictionType">
 		<xsd:sequence minOccurs="0" maxOccurs="1">
 			<xsd:element name="object-sizer" type="beanDeclarationType">
@@ -629,7 +727,7 @@ Entity computing sizes for objects stored into the grid.
 					]]></xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation>
-							<tool:exports type="com.gemstone.gemfire.cache.util.ObjectSizer" />
+							<tool:exports type="com.gemstone.gemfire.cache.util.ObjectSizer"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -671,7 +769,7 @@ performed.
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-	
+<!-- -->	
 	<xsd:simpleType name="evictionActionType">
 		<xsd:restriction base="xsd:string">
 			<xsd:enumeration value="LOCAL_DESTROY">
@@ -693,7 +791,6 @@ reclaim memory.
 			</xsd:enumeration>
 		</xsd:restriction>
 	</xsd:simpleType>
-	
 	<xsd:complexType name="diskStoreType">
 		<xsd:sequence>
 			<xsd:element name="disk-dir" minOccurs="0" maxOccurs="unbounded">
@@ -721,44 +818,22 @@ The maximum size (in megabytes) of data stored in each directory. Default is 102
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 Indicates whether the writing to the disk si synchronous or not. Default is false, meaning asynchronous writing.
-				]]>
-				</xsd:documentation>
+				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-compact" type="xsd:string" default="true">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 Indicates whether or not the operation logs are automatically compacted or not. Default is true.
-				]]>
-				</xsd:documentation>
+				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<!-- 
-		<xsd:attribute name="compaction-threshold" default="50">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Sets the threshold at which an oplog will become compactable. Until it reaches this threshold the oplog will not be 
-compacted. The threshold is a percentage in the range 0..100. When the amount of garbage in an oplog exceeds this 
-percentage then when a compaction is done this garbage will be cleaned up freeing up disk space. Garbage is created 
-by entry destroys, entry updates, and region destroys. 
-				]]>
-				</xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:restriction base="xsd:short">
-					<xsd:minExclusive value="0"/>
-					<xsd:maxExclusive value="100"/>
-				</xsd:restriction>
-			</xsd:simpleType>
-		</xsd:attribute>
-		 -->
 		<xsd:attribute name="max-oplog-size" type="xsd:string" default="1024">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 Sets the maximum size in megabytes a single oplog (operation log) is allowed to be. When an oplog is created this 
 amount of file space will be immediately reserved. 
-				]]>
-				</xsd:documentation>
+				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="time-interval" type="xsd:string" default="1">
@@ -766,8 +841,7 @@ amount of file space will be immediately reserved.
 				<xsd:documentation><![CDATA[
 Sets the number of milliseconds that can elapse before unwritten data is written to disk. 
 It is considered only for asynchronous writing. 
-				]]>
-				</xsd:documentation>
+				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="queue-size" type="xsd:string" default="0">
@@ -776,12 +850,20 @@ It is considered only for asynchronous writing.
 The maximum number of operations that can be asynchronously queued. Once this many pending async operations have been 
 queued async ops will begin blocking until some of the queued ops have been flushed to disk.
 Considered only for asynchronous writing.
-				]]>
-				</xsd:documentation>
+				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
+		<!-- <xsd:attribute name="compaction-threshold" default="50"> <xsd:annotation> 
+            <xsd:documentation><![CDATA[ Sets the threshold at which an oplog will become 
+            compactable. Until it reaches this threshold the oplog will not be compacted. 
+            The threshold is a percentage in the range 0..100. When the amount of garbage 
+            in an oplog exceeds this percentage then when a compaction is done this garbage 
+            will be cleaned up freeing up disk space. Garbage is created by entry destroys, 
+            entry updates, and region destroys. ]]> </xsd:documentation> </xsd:annotation> 
+            <xsd:simpleType> <xsd:restriction base="xsd:short"> <xsd:minExclusive value="0"/> 
+            <xsd:maxExclusive value="100"/> </xsd:restriction> </xsd:simpleType> </xsd:attribute> -->
 	</xsd:complexType>
-
+	<!-- -->
 	<xsd:element name="client-region">
 		<xsd:annotation>
 			<xsd:documentation source="org.springframework.data.gemfire.client.ClientRegionFactoryBean"><![CDATA[
@@ -790,7 +872,7 @@ which it receives its data. The client can hold some data locally or forward all
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.Region" />
+					<tool:exports type="com.gemstone.gemfire.cache.Region"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -811,13 +893,13 @@ to any key in this region in the CacheServer to be pushed to the client.
 									<xsd:complexContent>
 										<xsd:extension base="interestType">
 											<xsd:sequence minOccurs="0" maxOccurs="1">
-												<xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="skip">
-			    									<xsd:annotation>
-			         									<xsd:documentation><![CDATA[
+												<xsd:any namespace="##other" processContents="skip" minOccurs="0" maxOccurs="unbounded">
+													<xsd:annotation>
+														<xsd:documentation><![CDATA[
 Inner bean definition of the client key interest.
 														]]></xsd:documentation>
 													</xsd:annotation>
-			         							</xsd:any>						
+												</xsd:any>
 											</xsd:sequence>
 											<xsd:attribute name="key-ref" type="xsd:string" use="optional">
 												<xsd:annotation>
@@ -865,7 +947,7 @@ The action to take when performing eviction.
 									</xsd:extension>
 								</xsd:complexContent>
 							</xsd:complexType>
-						</xsd:element>						
+						</xsd:element>
 					</xsd:sequence>
 					<xsd:attribute name="data-policy" use="optional" default="NORMAL">
 						<xsd:annotation>
@@ -887,7 +969,7 @@ cache to differ from other caches.
 							</xsd:restriction>
 						</xsd:simpleType>
 					</xsd:attribute>
-					<xsd:attribute name="pool-name" use="optional" type="xsd:string">
+					<xsd:attribute name="pool-name" type="xsd:string" use="optional">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
 The name of the pool used by this client. If not set, a default pool (initialized when using client-cache) will be used.
@@ -918,7 +1000,7 @@ The ClientRegionShortcut for this region. Allows easy initialization of the regi
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
-	
+<!-- -->
 	<xsd:complexType name="connectionType">
 		<xsd:attribute name="host" type="xsd:string">
 			<xsd:annotation>
@@ -935,19 +1017,19 @@ The port number of the connection (between 1 and 65535 inclusive).
 			</xsd:annotation>
 			<xsd:simpleType>
 				<xsd:restriction base="xsd:string"/>
-			</xsd:simpleType>			
+			</xsd:simpleType>
 		</xsd:attribute>
 	</xsd:complexType>
-
+<!-- -->
 	<xsd:complexType name="interestType" abstract="true">
-		<xsd:attribute name="durable"  type="xsd:string" default="false" use="optional">
+		<xsd:attribute name="durable" type="xsd:string" use="optional" default="false">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 Indicates whether or not the registered interest is durable or not. Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="result-policy" default="KEYS_VALUES" use="optional">
+		<xsd:attribute name="result-policy" use="optional" default="KEYS_VALUES">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The result policy for this interest. Can be one of 'KEYS' or 'KEYS_VALUES' (the default) or 'NONE'. 
@@ -965,7 +1047,7 @@ NONE -  Does not initialize the local cache.
 				</xsd:restriction>
 			</xsd:simpleType>
 		</xsd:attribute>
-		<xsd:attribute name="receive-values" type="xsd:string" default="true" use="optional">
+		<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) 
@@ -973,9 +1055,9 @@ or only invalidations are received and the value will be received on the next ge
 Default is true.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 	</xsd:complexType>
-	
+<!-- -->
 	<xsd:element name="pool">
 		<xsd:annotation>
 			<xsd:documentation source="org.springframework.data.gemfire.client.PoolFactoryBean"><![CDATA[
@@ -985,7 +1067,7 @@ Note that in order to instantiate a pool, a GemFire cache needs to be already st
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.client.Pool" />
+					<tool:exports type="com.gemstone.gemfire.cache.client.Pool"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -1000,37 +1082,36 @@ Note that in order to instantiate a pool, a GemFire cache needs to be already st
 The name of the pool definition (by default "gemfire-pool").]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="free-connection-timeout" use="optional" type="xsd:string"/>
-			<xsd:attribute name="idle-timeout" use="optional" type="xsd:string"/>
-			<xsd:attribute name="load-conditioning-interval" use="optional" type="xsd:string"/>
-			<xsd:attribute name="max-connections" use="optional" type="xsd:string"/>
-			<xsd:attribute name="min-connections" use="optional" type="xsd:string"/>
-			<xsd:attribute name="multi-user-authentication" use="optional" type="xsd:string"/>
-			<xsd:attribute name="ping-interval" use="optional" type="xsd:string"/>
-			<xsd:attribute name="pr-single-hop-enabled" use="optional" type="xsd:string"/>
-			<xsd:attribute name="read-timeout" use="optional" type="xsd:string"/>
-			<xsd:attribute name="retry-attempts" use="optional" type="xsd:string"/>
-			<xsd:attribute name="server-group" use="optional" type="xsd:string"/>
-			<xsd:attribute name="socket-buffer-size" use="optional" type="xsd:string"/>
-			<xsd:attribute name="statistic-interval" use="optional" type="xsd:string"/>
-			<xsd:attribute name="subscription-ack-interval" use="optional" type="xsd:string"/>
-			<xsd:attribute name="subscription-enabled" use="optional" type="xsd:string"/>
-			<xsd:attribute name="subscription-message-tracking-timeout" use="optional" type="xsd:string"/>
-			<xsd:attribute name="subscription-redundancy" use="optional" type="xsd:string"/>
-			<xsd:attribute name="thread-local-connections" use="optional" type="xsd:string"/>
+			<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="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="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:element name="cache-server">
 		<xsd:annotation>
-			<xsd:documentation
-				source="org.springframework.data.gemfire.server.CacheServerFactoryBean"><![CDATA[
+			<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="com.gemstone.gemfire.cache.server.CacheServer" />
+					<tool:exports type="com.gemstone.gemfire.cache.server.CacheServer"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -1052,8 +1133,8 @@ The client subscription configuration that is used to control a clients use of s
 								</xsd:restriction>
 							</xsd:simpleType>
 						</xsd:attribute>
-						<xsd:attribute name="capacity" use="optional" default="1" type="xsd:string"/>
-						<xsd:attribute name="disk-store" use="optional" default="." type="xsd:string"/>
+						<xsd:attribute name="capacity" type="xsd:string" use="optional" default="1"/>
+						<xsd:attribute name="disk-store" type="xsd:string" use="optional" default="."/>
 					</xsd:complexType>
 				</xsd:element>
 			</xsd:sequence>
@@ -1062,146 +1143,145 @@ The client subscription configuration that is used to control a clients use of s
 					<xsd:documentation><![CDATA[The name of the cache server definition (by default "gemfire-server").]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="auto-startup" use="optional" type="xsd:string" default="true" />
-			<xsd:attribute name="bind-address" use="optional" type="xsd:string" />
-			<xsd:attribute name="port" use="optional" type="xsd:string" default="40404">
+			<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" use="optional" type="xsd:string" />
-			<xsd:attribute name="load-poll-interval" use="optional" type="xsd:string" default="5000" />
-			<xsd:attribute name="max-connections" use="optional" type="xsd:string" default="800" />
-			<xsd:attribute name="max-threads" use="optional" type="xsd:string" default="0" />
-			<xsd:attribute name="max-message-count" use="optional" type="xsd:string" default="230000" />
-			<xsd:attribute name="max-time-between-pings" use="optional"	type="xsd:string" default="60000" />
-			<xsd:attribute name="message-time-to-live" use="optional" type="xsd:string" default="180" />
-			<xsd:attribute name="socket-buffer-size" use="optional"	type="xsd:string" default="32768" />
-			<xsd:attribute name="notify-by-subscription" use="optional"	type="xsd:string" default="true" />
-			<xsd:attribute name="groups" use="optional"	type="xsd:string" default="">
+			<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" use="optional" type="xsd:string">
+			<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:attribute name="cache-ref" type="xsd:string" default="gemfire-cache" use="optional">
+			<xsd:attribute name="cache-ref" type="xsd:string" use="optional" default="gemfire-cache">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[The name of the bean defining the GemFire cache (by default 'gemfire-cache').]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
-  	<xsd:element name="cq-listener-container">
-	    <xsd:annotation>
-	      <xsd:documentation><![CDATA[
+<!-- -->
+	<xsd:element name="cq-listener-container">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
 Container for continuous query listeners. All listeners will be hosted by the same container.
 	      ]]></xsd:documentation>
-	      <xsd:appinfo>
-	        <tool:annotation>
-	          <tool:exports type="org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer"/>
-	        </tool:annotation>
-	      </xsd:appinfo>
-	    </xsd:annotation>
-	    <xsd:complexType>
-	      <xsd:sequence>
-	        <xsd:element name="listener" type="listenerType" minOccurs="0" maxOccurs="unbounded"/>
-	      </xsd:sequence>
-	      <xsd:attribute name="cache" type="xsd:string" default="gemfire-cache">
-	        <xsd:annotation>
-	          <xsd:documentation><![CDATA[
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="listener" type="listenerType" minOccurs="0" maxOccurs="unbounded"/>
+			</xsd:sequence>
+			<xsd:attribute name="cache" type="xsd:string" default="gemfire-cache">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
 A reference (by name) to the GemFire cache bean. Default is "gemfire-cache".
 	          ]]></xsd:documentation>
-	          <xsd:appinfo>
-	            <tool:annotation kind="ref">
-	              <tool:expected-type type="com.gemstone.gemfire.cache.RegionService"/>
-	            </tool:annotation>
-	          </xsd:appinfo>
-	        </xsd:annotation>
-	      </xsd:attribute>
-	      <xsd:attribute name="task-executor" type="xsd:string">
-	        <xsd:annotation>
-	          <xsd:documentation><![CDATA[
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type type="com.gemstone.gemfire.cache.RegionService"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="task-executor" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
 A reference to a Spring TaskExecutor (or standard JDK 1.5 Executor) for executing
 GemFire listener invokers. Default is a SimpleAsyncTaskExecutor.
 	          ]]></xsd:documentation>
-	          <xsd:appinfo>
-	            <tool:annotation kind="ref">
-	              <tool:expected-type type="java.util.concurrent.Executor"/>
-	            </tool:annotation>
-	          </xsd:appinfo>
-	        </xsd:annotation>
-	      </xsd:attribute>
-	      <xsd:attribute name="phase" type="xsd:string">
-	        <xsd:annotation>
-	          <xsd:documentation><![CDATA[
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type type="java.util.concurrent.Executor"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="phase" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
 The lifecycle phase within which this container should start and stop. The lower
 the value the earlier this container will start and the later it will stop. The
 default is Integer.MAX_VALUE meaning the container will start as late as possible
 and stop as soon as possible.
 	          ]]></xsd:documentation>
-	        </xsd:annotation>
-	      </xsd:attribute>
-		  <xsd:attribute name="pool-name" use="optional" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="pool-name" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
 The name of the pool used by the container.
  						]]></xsd:documentation>
-			</xsd:annotation>
-		  </xsd:attribute>
-	    </xsd:complexType>
-	  </xsd:element>
-	
-	  <xsd:complexType name="listenerType">
-	    <xsd:attribute name="ref" type="xsd:string" use="required">
-	      <xsd:annotation>
-	        <xsd:documentation><![CDATA[
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+<!-- -->
+	<xsd:complexType name="listenerType">
+		<xsd:attribute name="ref" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
 The bean name of the listener object, implementing the ContinuousQueryListener interface or defining the specified listener method.
 Required.
 	        ]]></xsd:documentation>
-	        <xsd:appinfo>
-	          <tool:annotation kind="ref"/>
-	        </xsd:appinfo>
-	      </xsd:annotation>
-	    </xsd:attribute>
-	    <xsd:attribute name="query" type="xsd:string" use="required">
-	      <xsd:annotation>
-	        <xsd:documentation><![CDATA[
+				<xsd:appinfo>
+					<tool:annotation kind="ref"/>
+				</xsd:appinfo>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="query" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
 The query for the GemFire continuous query. 
 	        ]]></xsd:documentation>
-	      </xsd:annotation>
-	    </xsd:attribute>
-	    <xsd:attribute name="method" type="xsd:string" use="optional">
-	      <xsd:annotation>
-	        <xsd:documentation><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="method" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
 The name of the listener method to invoke. If not specified, the target bean is supposed to implement the ContinuousQueryListener
 interface or provide a method named 'handleEvent'.
 	        ]]></xsd:documentation>
-	      </xsd:annotation>
-	    </xsd:attribute>
-	    <xsd:attribute name="name" type="xsd:string" use="optional">
-	      <xsd:annotation>
-	        <xsd:documentation><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="name" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
 The name of the resulting GemFire continuous query. Useful for monitoring and statistics querying. 
 	        ]]></xsd:documentation>
-	      </xsd:annotation>
-	    </xsd:attribute>
-	    <xsd:attribute name="durable" type="xsd:string" use="optional">
-	      <xsd:annotation>
-	        <xsd:documentation><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="durable" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
 Whether the resulting GemFire continuous query is durable or not. 
 	        ]]></xsd:documentation>
-	      </xsd:annotation>
-	    </xsd:attribute>
-	    
+			</xsd:annotation>
+		</xsd:attribute>
 	</xsd:complexType>
-	
+<!-- -->
 	<xsd:element name="index">
 		<xsd:annotation>
 			<xsd:documentation source="org.springframework.data.gemfire.IndexFactoryBean"><![CDATA[
@@ -1209,7 +1289,7 @@ Defines a GemFire index.
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.query.Index" />
+					<tool:exports type="com.gemstone.gemfire.cache.query.Index"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -1228,30 +1308,29 @@ The name of the bean index definition. If property 'name' is not set, it will be
 					</xsd:restriction>
 				</xsd:simpleType>
 			</xsd:attribute>
-			<xsd:attribute name="name" use="optional" type="xsd:string">
+			<xsd:attribute name="name" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 The name of the index.]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="expression" use="required" type="xsd:string"/>
-			<xsd:attribute name="from" use="required" type="xsd:string"/>
-			<xsd:attribute name="imports" use="optional" type="xsd:string"/>
-			<xsd:attribute name="override" use="optional" type="xsd:string" default="true">
+			<xsd:attribute name="expression" type="xsd:string" use="required"/>
+			<xsd:attribute name="from" type="xsd:string" use="required"/>
+			<xsd:attribute name="imports" type="xsd:string" use="optional"/>
+			<xsd:attribute name="override" type="xsd:string" use="optional" default="true">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 Indicates whether the index is created even if there is an index with the same name (default) or not.]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			
-			<xsd:attribute name="cache-ref" type="xsd:string" default="gemfire-cache" use="optional">
+			<xsd:attribute name="cache-ref" type="xsd:string" use="optional" default="gemfire-cache">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 The name of the bean defining the GemFire cache (by default 'gemfire-cache').
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="pool-name" use="optional" type="xsd:string">
+			<xsd:attribute name="pool-name" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 The name of the pool used by the index. Used usually in client scenarios.
@@ -1260,14 +1339,13 @@ The name of the pool used by the index. Used usually in client scenarios.
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
 	<!-- Repositories -->
 	<xsd:element name="repositories">
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="repository:repositories">
 					<xsd:sequence>
-						<xsd:element name="repository" minOccurs="0" maxOccurs="unbounded" type="gemfire-repository"/>
+						<xsd:element name="repository" type="gemfire-repository" minOccurs="0" maxOccurs="unbounded"/>
 					</xsd:sequence>
 					<xsd:attributeGroup ref="gemfire-repository-attributes"/>
 					<xsd:attributeGroup ref="repository:repository-attributes"/>
@@ -1275,7 +1353,7 @@ The name of the pool used by the index. Used usually in client scenarios.
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
-	
+<!-- -->
 	<xsd:complexType name="gemfire-repository">
 		<xsd:complexContent>
 			<xsd:extension base="repository:repository">
@@ -1284,17 +1362,18 @@ The name of the pool used by the index. Used usually in client scenarios.
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	
+<!-- -->
 	<xsd:attributeGroup name="gemfire-repository-attributes">
 		<xsd:attribute name="gemfire-template-ref" type="gemfireTemplateRef" default="gemfireTemplate">
 			<xsd:annotation>
 				<xsd:documentation>
-					The reference to a GemfireTemplate. Will default to 'gemfireTemplate'.
-				</xsd:documentation>
+                    The reference to a GemfireTemplate.
+                    Will default to 'gemfireTemplate'.
+                </xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:attributeGroup>
-	
+<!-- -->
 	<xsd:simpleType name="gemfireTemplateRef">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -1305,5 +1384,42 @@ The name of the pool used by the index. Used usually in client scenarios.
 		</xsd:annotation>
 		<xsd:union memberTypes="xsd:string"/>
 	</xsd:simpleType>
-	
-</xsd:schema>
\ No newline at end of file
+<!-- -->
+	<xsd:complexType name="jndiBindingType">
+		<xsd:sequence>
+			<xsd:element name="configProperty" type="configPropertyType" minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:sequence>
+		<xsd:attribute name="jndi-name" type="xsd:string" use="required"/>
+		<xsd:attribute name="type" use="required">
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:string">
+					<xsd:enumeration value="ManagedDataSource"/>
+					<xsd:enumeration value="SimpeDataSource"/>
+					<xsd:enumeration value="PooledDataSource"/>
+					<xsd:enumeration value="XaPooledDataSource"/>
+				</xsd:restriction>
+			</xsd:simpleType>
+		</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">
+		<xsd:sequence>
+			<xsd:element name="configPropertyName" type="xsd:string"/>
+			<xsd:element name="configPropertyType" type="xsd:string"/>
+			<xsd:element name="configPropertyValue" type="xsd:string"/>
+		</xsd:sequence>
+	</xsd:complexType>
+</xsd:schema>
diff --git a/src/test/java/org/springframework/data/gemfire/SubRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/SubRegionFactoryBeanTest.java
new file mode 100644
index 00000000..0e387e00
--- /dev/null
+++ b/src/test/java/org/springframework/data/gemfire/SubRegionFactoryBeanTest.java
@@ -0,0 +1,13 @@
+package org.springframework.data.gemfire;
+
+import org.junit.Test;
+
+public class SubRegionFactoryBeanTest {
+	@Test
+	public void test() throws Exception {
+		SubRegionFactoryBean srfb = new SubRegionFactoryBean();
+		srfb.setName("child");
+		srfb.afterPropertiesSet();
+		SubRegion sr = srfb.getObject();
+	}
+}
diff --git a/src/test/java/org/springframework/data/gemfire/config/ReplicatedRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/ReplicatedRegionNamespaceTest.java
index 56eaf569..a943bfc0 100644
--- a/src/test/java/org/springframework/data/gemfire/config/ReplicatedRegionNamespaceTest.java
+++ b/src/test/java/org/springframework/data/gemfire/config/ReplicatedRegionNamespaceTest.java
@@ -18,15 +18,18 @@ package org.springframework.data.gemfire.config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.data.gemfire.RegionFactoryBean;
 import org.springframework.data.gemfire.RegionLookupFactoryBean;
+import org.springframework.data.gemfire.SubRegion;
 import org.springframework.data.gemfire.TestUtils;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -87,4 +90,10 @@ public class ReplicatedRegionNamespaceTest {
 		assertEquals("existing", TestUtils.readField("name", lfb));
 		assertEquals(existing, context.getBean("lookup"));
 	}
+	
+	@Test
+	public void testNestedRegions() {
+		Object parent = context.getBean("parent");
+		//SubRegion child = context.getBean("/parent/child", SubRegion.class);
+	}
 }
\ No newline at end of file
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
index 5b8659e2..61dc0074 100644
--- a/src/test/resources/log4j.properties
+++ b/src/test/resources/log4j.properties
@@ -6,6 +6,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
 
 log4j.category.org.springframework.data.gemfire.listener=TRACE
 log4j.category.org.springframework.data.gemfire.repository=DEBUG
+#log4j.category.org.springframework=DEBUG
 
 # for debugging datasource initialization
 # log4j.category.test.jdbc=DEBUG
diff --git a/src/test/resources/org/springframework/data/gemfire/config/replicated-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/replicated-ns.xml
index 3fe3436a..a2c3dfa6 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/replicated-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/replicated-ns.xml
@@ -28,4 +28,8 @@
 	<bean id="c-writer" class="org.springframework.data.gemfire.SimpleCacheWriter"/>
 	
 	<gfe:lookup-region id="lookup" name="existing"/>
+    
+    <gfe:replicated-region id="parent">
+        <gfe:replicated-region name="child"/>
+    </gfe:replicated-region>
 </beans>
\ No newline at end of file