diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.6.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.6.xsd
index d8bc4fba..aaa939a0 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.6.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.6.xsd
@@ -2197,7 +2197,7 @@ Container for continuous query listeners. All listeners will be hosted by the sa
 			<xsd:attribute name="id" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-The id of the listener (optional)
+identifier of the listener (optional)
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
@@ -2205,10 +2205,10 @@ The id of the listener (optional)
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 A reference (by name) to the GemFire Cache bean. Default is "gemfireCache".
-	          ]]></xsd:documentation>
+	          		]]></xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="com.gemstone.gemfire.cache.RegionService" />
+							<tool:expected-type type="com.gemstone.gemfire.cache.RegionService"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -2217,20 +2217,10 @@ A reference (by name) to the GemFire Cache bean. Default is "gemfireCache".
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 The name of the GemFire Pool used by the container.
- 						]]></xsd:documentation>
+ 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 			<xsd:attribute name="auto-startup" type="xsd:string" use="optional" default="true"/>
-			<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="error-handler" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
@@ -2238,11 +2228,20 @@ A reference to a Spring ErrorHandler strategy handling any errors that may occur
 	          		]]></xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="java.util.concurrent.Executor"/>
+							<tool:expected-type type="org.springframework.util.ErrorHandler"/>
 						</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="task-executor" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[