From 3b717be06ac8ae151b8bd2dad3cf58f8b4ec0950 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Mon, 28 Nov 2016 15:29:34 +0100
Subject: [PATCH] DATACASS-351 - Revert Spring Data Cassandra 1.5 changes in
 1.0 schema files.

Revert added features in version 1.0 schema files in favor of version 1.5 schema files. Remove license header. Remove TODOs and fix documentation source names.
---
 .../cassandra/config/spring-cql-1.0.xsd       | 686 +++++-------
 .../cassandra/config/spring-cql-1.5.xsd       |  25 +-
 .../cassandra/config/spring-cassandra-1.0.xsd | 977 ++++++++----------
 .../cassandra/config/spring-cassandra-1.5.xsd |  24 +-
 4 files changed, 690 insertions(+), 1022 deletions(-)

diff --git a/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd b/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd
index 8c5ad68e3..442a21e23 100644
--- a/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd
+++ b/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd
@@ -6,11 +6,11 @@
 			elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/tool"
-				schemaLocation="http://www.springframework.org/schema/tool/spring-tool.xsd" />
+				schemaLocation="http://www.springframework.org/schema/tool/spring-tool.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
-Defines the configuration elements in the XML namespace for Spring Cassandra.
+Defines the configuration elements for Spring Cassandra support.
 		]]></xsd:documentation>
 	</xsd:annotation>
 
@@ -31,12 +31,12 @@ Defines a Cassandra cluster.
 	<xsd:element name="session" type="sessionType">
 		<xsd:annotation>
 			<xsd:documentation
-				source="org.springframework.data.cassandra.config.xml.CassandraDataSessionFactoryBean"><![CDATA[
+					source="org.springframework.cassandra.config.xml.CassandraSessionFactoryBean"><![CDATA[
 Defines a Cassandra session.
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports type="com.datastax.driver.core.Session" />
+					<tool:exports type="com.datastax.driver.core.Session"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -45,13 +45,12 @@ Defines a Cassandra session.
 	<xsd:element name="template" type="templateType">
 		<xsd:annotation>
 			<xsd:documentation
-				source="org.springframework.data.cassandra.config.xml.CassandraDataTemplateFactoryBean"><![CDATA[
-Defines a CassandraTemplate.
+					source="org.springframework.cassandra.config.xml.CassandraTemplateFactoryBean"><![CDATA[
+Defines a CqlTemplate.
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports
-						type="org.springframework.data.cassandra.CassandraTemplate" />
+					<tool:exports type="org.springframework.cassandra.CqlTemplate"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -68,59 +67,42 @@ Defines a CassandraTemplate.
 		<xsd:union memberTypes="xsd:string" />
 	</xsd:simpleType>
 
-	<xsd:simpleType name="executorRef" final="union">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation kind="ref">
-					<tool:assignable-to type="java.util.concurrent.Executor"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:union memberTypes="xsd:string" />
-	</xsd:simpleType>
-
-	<xsd:simpleType name="sessionRef" final="union">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation kind="ref">
-					<tool:assignable-to type="com.datastax.driver.core.Session" />
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:union memberTypes="xsd:string" />
-	</xsd:simpleType>
-
 	<xsd:complexType name="clusterType">
 		<xsd:sequence>
-			<xsd:element name="local-pooling-options" type="poolingOptionsType" minOccurs="0" maxOccurs="1">
+			<xsd:element name="local-pooling-options" type="poolingOptionsType"
+						 maxOccurs="1" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 Local pooling options.
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="remote-pooling-options" type="poolingOptionsType" minOccurs="0" maxOccurs="1">
+			<xsd:element name="remote-pooling-options" type="poolingOptionsType"
+						 minOccurs="0" maxOccurs="1">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 Remote pooling options.
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="socket-options" type="socketOptionsType" minOccurs="0" maxOccurs="1">
+			<xsd:element name="socket-options" type="socketOptionsType"
+						 maxOccurs="1" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 Socket options.
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="keyspace" type="keyspaceType" minOccurs="0" maxOccurs="unbounded">
+			<xsd:element name="keyspace" type="keyspaceType"
+						 minOccurs="0" maxOccurs="unbounded">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 Provides the ability to define a keyspace.
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="startup-cql" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
+			<xsd:element name="startup-cql" type="xsd:string"
+						 minOccurs="0" maxOccurs="unbounded">
 				<!-- TODO: cql could come from a resource via a resource attribute... -->
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
@@ -128,7 +110,8 @@ Arbitrary CQL script to be executed against the system keyspace during bean init
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="shutdown-cql" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
+			<xsd:element name="shutdown-cql" type="xsd:string"
+						 minOccurs="0" maxOccurs="unbounded">
 				<!-- TODO: cql could come from a resource via a resource attribute... -->
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
@@ -144,22 +127,76 @@ The name of the Cassandra Cluster definition; default is "cassandra-cluster".
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="address-translator-ref" use="optional">
+		<xsd:attribute name="contact-points" type="xsd:string"
+					   use="optional" default="localhost">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-Configures the address translator to use for the new cluster.
+The comma separated list of Cassandra servers.  Default is "localhost".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="port" type="xsd:string" use="optional"
+					   default="9042">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The native CQL port to connect to.  Default is 9042.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="compression" default="NONE" use="optional"
+					   type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The protocol compression option. Default is "NONE".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="username" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+When Authentication is enabled, the username to use when connecting to the Cluster.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="password" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+When Authentication is enabled, the password to use when connecting to the Cluster.
+				]]>
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="metrics-enabled" type="xsd:string"
+					   default="true">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Determine whether or not to collect metrics.  Defaults to true.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="jmx-reporting-enabled" type="xsd:string"
+					   default="true">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Determine whether or not to enable JMX Reporting.  Defaults to true.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="deferred-initialization" type="xsd:string"
+					   default="false">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Determine if we defer initalizing the cluster until a connection is requested. Defaults to false.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="ssl-enabled" type="xsd:string"
+					   default="false">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Determine if SSL is used for Cassandra communication. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:assignable-to type="com.datastax.driver.core.policies.AddressTranslator"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string"/>
-			</xsd:simpleType>
 		</xsd:attribute>
 		<xsd:attribute name="auth-info-provider-ref" use="optional">
 			<xsd:annotation>
@@ -171,119 +208,13 @@ AuthInfoProvider implementation.
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:assignable-to type="com.datastax.driver.core.AuthInfoProvider" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
-			</xsd:simpleType>
-		</xsd:attribute>
-		<xsd:attribute name="cluster-builder-configurer-ref" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Sets the ClusterBuilderConfigurer used to apply additional configuration logic
-to the com.datastax.driver.core.Cluster.Builder.
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:assignable-to type="org.springframework.cassandra.config.ClusterBuilderConfigurer"/>
+							<tool:assignable-to type="com.datastax.driver.core.AuthInfoProvider"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
 				<xsd:union memberTypes="xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
-		<xsd:attribute name="cluster-name" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-An optional name for the create cluster.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="compression" type="xsd:string" default="NONE" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The protocol compression option. Default is "NONE".
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="contact-points" type="xsd:string" default="localhost" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The comma separated list of Cassandra servers.  Default is "localhost".
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="heartbeat-interval-seconds" type="xsd:string" default="30" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Pooling option to set the heartbeat interval seconds, after which a message is sent on an idle connection
-to make sure it's still alive. Applies to both local and remote pooling options (see
-com.datastax.driver.core.HostDistance and com.datastax.driver.core.PoolingOptions) for more details.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="host-state-listener-ref" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Custom Host State Listener for the Cassandra Cluster.
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:assignable-to type="com.datastax.driver.core.Host.StateListener" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
-			</xsd:simpleType>
-		</xsd:attribute>
-		<xsd:attribute name="idle-timeout-seconds" type="xsd:string" default="120" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Pooling option to set the timeout in seconds before an idle connection is removed. Applies to both local and remote
-pooling options (see com.datastax.driver.core.HostDistance and com.datastax.driver.core.PoolingOptions) for more details.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="initialization-executor-ref" type="executorRef" use="optional">
-			<xsd:annotation>
-				<xsd:documentation source="org.springframework.cassandra.config.PoolingOptionsFactoryBean"><![CDATA[
-Pooling option defining a reference to an Executor used to initialize the Cassandra Pool. Applies to both local
-and remote pooling options (see com.datastax.driver.core.HostDistance
-and com.datastax.driver.core.PoolingOptions) for more details.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="jmx-reporting-enabled" type="xsd:string" default="true">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Determine whether or not to enable JMX Reporting.  Defaults to true.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="latency-tracker-ref" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Custom Latency Tracker for the Cassandra Cluster.
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:assignable-to type="com.datastax.driver.core.LatencyTracker" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
-			</xsd:simpleType>
-		</xsd:attribute>
 		<xsd:attribute name="load-balancing-policy-ref" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -295,80 +226,13 @@ LoadBalancingPolicy implementation.
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
 							<tool:assignable-to
-								type="com.datastax.driver.core.policies.LoadBalancingPolicy" />
+									type="com.datastax.driver.core.policies.LoadBalancingPolicy"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
+				<xsd:union memberTypes="xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
-		<xsd:attribute name="netty-options-ref" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-NettyOptions implementation reference.
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:assignable-to
-								type="com.datastax.driver.core.NettyOptions" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
-			</xsd:simpleType>
-		</xsd:attribute>
-		<xsd:attribute name="max-queue-size" type="xsd:string" default="256" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Sets the maximum number of requests that get enqueued if no connection is available.
-If the queue grows past this value, new requests will be rejected immediately (and the driver will move to the
-next host in the query plan). This limit is per connection pool, not global to the driver.
-See com.datastax.driver.core.PoolingOption for more details. Available since Cassandra Driver 3.1.1.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="max-schema-agreement-wait-seconds" type="xsd:string" default="10" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Sets the maximum time to wait for schema agreement before returning from a DDL query. Defaults to 10 seconds.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="metrics-enabled" type="xsd:string"
-					   default="true">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Determine whether or not to collect metrics.  Defaults to true.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="password" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-When Authentication is enabled, the password to use when connecting to the Cluster.
-				]]>
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pool-timeout-milliseconds" type="xsd:string" default="5000" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Pooling option to set the timeout in milliseconds when trying to acquire a connection from a host's pool. Applies to
-both local and remote pooling options (see com.datastax.driver.core.HostDistance
-and com.datastax.driver.core.PoolingOptions) for more details.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="port" type="xsd:string" use="optional" default="9042">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The native CQL port to connect to.  Default is 9042.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 		<xsd:attribute name="reconnection-policy-ref" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -380,11 +244,11 @@ ReconnectionPolicy implementation.
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
 							<tool:assignable-to
-								type="com.datastax.driver.core.policies.ReconnectionPolicy" />
+									type="com.datastax.driver.core.policies.ReconnectionPolicy"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
+				<xsd:union memberTypes="xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
 		<xsd:attribute name="retry-policy-ref" use="optional">
@@ -398,37 +262,13 @@ RetryPolicy implementation.
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
 							<tool:assignable-to
-								type="com.datastax.driver.core.policies.RetryPolicy" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
-			</xsd:simpleType>
-		</xsd:attribute>
-		<xsd:attribute name="speculative-execution-policy-ref" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Configures the speculative execution policy to use for the new cluster.
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:assignable-to type="com.datastax.driver.core.policies.SpeculativeExecutionPolicy"/>
+									type="com.datastax.driver.core.policies.RetryPolicy"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
 				<xsd:union memberTypes="xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
-		<xsd:attribute name="ssl-enabled" type="xsd:string" default="false">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Determine if SSL is used for Cassandra communication. Defaults to false.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 		<xsd:attribute name="ssl-options-ref" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -439,100 +279,74 @@ Custom SSL Options. sslEnabled must be true for sslOptions to be used.
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:assignable-to type="com.datastax.driver.core.SSLOptions" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
-			</xsd:simpleType>
-		</xsd:attribute>
-		<xsd:attribute name="timestamp-generator-ref" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Configures the generator that will produce the client-side timestamp sent with each query.
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:assignable-to type="com.datastax.driver.core.TimestampGenerator"/>
+							<tool:assignable-to type="com.datastax.driver.core.SSLOptions"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
 				<xsd:union memberTypes="xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
-		<xsd:attribute name="username" type="xsd:string" use="optional">
+		<xsd:attribute name="host-state-listener-ref" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-When Authentication is enabled, the username to use when connecting to the Cluster.
+Custom Host State Listener for the Cassandra Cluster.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="datacenterType">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
-Provides the ability to specify replication factors by data center.
-					]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="name" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The name of the data center.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="replication-factor" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The replication factor for the data center.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="keyspaceType">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
-Provides the ability to define keyspaces.
-					]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="replication" type="replicationType" minOccurs="0" maxOccurs="1">
+			<xsd:simpleType>
 				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-Provides the ability to configure the keyspace's replication settings.
-					]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="com.datastax.driver.core.Host.StateListener"/>
+						</tool:annotation>
+					</xsd:appinfo>
 				</xsd:annotation>
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="action" use="required" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The keyspace action to take at startup and possibly shutdown.
-				]]></xsd:documentation>
-			</xsd:annotation>
+				<xsd:union memberTypes="xsd:string"/>
+			</xsd:simpleType>
 		</xsd:attribute>
-		<xsd:attribute name="durable-writes" type="xsd:string" use="optional" default="false">
+		<xsd:attribute name="latency-tracker-ref" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-Whether or not the keyspace supports durable writes.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="name" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The name of this keyspace.  Required.
+Custom Latency Tracker for the Cassandra Cluster.
 				]]></xsd:documentation>
 			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="com.datastax.driver.core.LatencyTracker"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+				<xsd:union memberTypes="xsd:string"/>
+			</xsd:simpleType>
 		</xsd:attribute>
 	</xsd:complexType>
+	<xsd:simpleType name="sessionRef" final="union">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="com.datastax.driver.core.Session"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
 
 	<xsd:complexType name="poolingOptionsType">
+		<xsd:attribute name="min-simultaneous-requests" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+If the utilisation of opened connections drops below by this configured threshold, then cassandra drops connections till core-connections.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="max-simultaneous-requests" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+If the utilisation of connections reaches this configurable threshold, then cassandra creates more connections up to max-connections.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
 		<xsd:attribute name="core-connections" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -547,62 +361,6 @@ More connections are created up to a configurable maximum number of connections.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="max-simultaneous-requests" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-If the utilisation of connections reaches this configurable threshold, then cassandra creates more connections up to max-connections.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="min-simultaneous-requests" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-If the utilisation of opened connections drops below by this configured threshold, then cassandra drops connections till core-connections.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="sessionType">
-		<xsd:sequence>
-			<xsd:element name="startup-cql" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
-				<!-- TODO: cql could come from a resource via a resource attribute... -->
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-Arbitrary CQL script to be executed against the session's keyspace during bean initialization.  Multiple elements will be executed in document order.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="shutdown-cql" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
-				<!-- TODO: cql could come from a resource via a resource attribute... -->
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-Arbitrary CQL script to be executed against the session's keyspace during bean destruction.  Multiple elements will be executed in document order.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The name of the session definition; default is "cassandra-session".
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="cluster-ref" type="clusterRef" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The reference to a Cassandra cluster; default is "cassandra-cluster".
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="keyspace-name" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The name of a Cassandra Keyspace.  No default; for the system keyspace, use the empty string.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="socketOptionsType">
@@ -627,13 +385,6 @@ Sets read timeout for client socket in milliseconds.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="receive-buffer-size" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Sets the SO_RCVBUF socket option.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 		<xsd:attribute name="reuse-address" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -641,13 +392,6 @@ Sets the SO_REUSEADDR socket option.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="send-buffer-size" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Sets the SO_SNDBUF socket option.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 		<xsd:attribute name="so-linger" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -662,34 +406,63 @@ Sets the SO_TCPNODELAY socket option.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
+		<xsd:attribute name="receive-buffer-size" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the SO_RCVBUF socket option.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="send-buffer-size" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the SO_SNDBUF socket option.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
 	</xsd:complexType>
 
-	<xsd:complexType name="replicationType">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
-Provides the ability to configure the keyspace's replication settings.
-					]]></xsd:documentation>
-		</xsd:annotation>
+	<xsd:complexType name="sessionType">
 		<xsd:sequence>
-			<xsd:element name="data-center" type="datacenterType" minOccurs="0" maxOccurs="unbounded">
+			<xsd:element name="startup-cql" type="xsd:string"
+						 minOccurs="0" maxOccurs="unbounded">
+				<!-- TODO: cql could come from a resource via a resource attribute... -->
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-Provides the ability to specify replication factors by data center.
+Arbitrary CQL script to be executed against the session's keyspace during bean initialization.  Multiple elements will be executed in document order.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="shutdown-cql" type="xsd:string"
+						 minOccurs="0" maxOccurs="unbounded">
+				<!-- TODO: cql could come from a resource via a resource attribute... -->
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Arbitrary CQL script to be executed against the session's keyspace during bean destruction.  Multiple elements will be executed in document order.
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>
-		<xsd:attribute name="class" type="xsd:string" use="optional" default="SimpleStrategy">
+
+		<xsd:attribute name="id" type="xsd:ID" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The name of the replication class; default is "SIMPLE_STRATEGY".
+The name of the session definition; default is "cassandraSession".
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="replication-factor" type="xsd:string" use="optional" default="1">
+		<xsd:attribute name="cluster-ref" type="clusterRef" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The replication factor; default is 1.
+The reference to a Cassandra cluster; default is "cassandraCluster".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="keyspace-name" type="xsd:string"
+					   use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of a Cassandra Keyspace.  No default; for the system keyspace, use the empty string.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -699,17 +472,112 @@ The replication factor; default is 1.
 		<xsd:attribute name="id" type="xsd:ID" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The name of the template; default is "cassandraTemplate".
+The name of the template; default is "cqlTemplate".
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="session-ref" type="sessionRef" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The reference to a Cassandra session; default is "cassandra-session".
+The reference to a Cassandra session; default is "cassandraSession".
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
 
-</xsd:schema>
+	<xsd:complexType name="keyspaceType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Provides the ability to define keyspaces.
+					]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="replication" type="replicationType"
+						 minOccurs="0" maxOccurs="1">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Provides the ability to configure the keyspace's replication settings.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="name" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of this keyspace.  Required.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="action" use="required" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The keyspace action to take at startup and possibly shutdown.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="durable-writes" type="xsd:string"
+					   use="optional" default="false">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Whether or not the keyspace supports durable writes.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:complexType name="replicationType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Provides the ability to configure the keyspace's replication settings.
+					]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="data-center" type="datacenterType"
+						 minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Provides the ability to specify replication factors by data center.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="class" type="xsd:string" use="optional"
+					   default="SIMPLE_STRATEGY">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of the replication class; default is "SIMPLE_STRATEGY".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="replication-factor" type="xsd:string"
+					   use="optional" default="1">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The replication factor; default is 1.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+	<xsd:complexType name="datacenterType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Provides the ability to specify replication factors by data center.
+					]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="name" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of the data center.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="replication-factor" type="xsd:string"
+					   use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The replication factor for the data center.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+</xsd:schema>
\ No newline at end of file
diff --git a/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.5.xsd b/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.5.xsd
index b89f0a674..9b8b0352f 100644
--- a/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.5.xsd
+++ b/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.5.xsd
@@ -1,19 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2016 the original author or authors.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 <xsd:schema xmlns="http://www.springframework.org/schema/cql"
 			xmlns:tool="http://www.springframework.org/schema/tool"
 			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -46,7 +31,7 @@ Defines a Cassandra cluster.
 	<xsd:element name="session" type="sessionType">
 		<xsd:annotation>
 			<xsd:documentation
-				source="org.springframework.data.cassandra.config.xml.CassandraDataSessionFactoryBean"><![CDATA[
+				source="org.springframework.cassandra.config.CassandraCqlSessionFactoryBean"><![CDATA[
 Defines a Cassandra session.
 			]]></xsd:documentation>
 			<xsd:appinfo>
@@ -60,13 +45,13 @@ Defines a Cassandra session.
 	<xsd:element name="template" type="templateType">
 		<xsd:annotation>
 			<xsd:documentation
-				source="org.springframework.data.cassandra.config.xml.CassandraDataTemplateFactoryBean"><![CDATA[
+				source="org.springframework.cassandra.config.CassandraCqlTemplateFactoryBean"><![CDATA[
 Defines a CassandraTemplate.
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
 					<tool:exports
-						type="org.springframework.data.cassandra.CassandraTemplate" />
+						type="org.springframework.cassandra.core.CqlTemplate" />
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -136,7 +121,6 @@ Provides the ability to define a keyspace.
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="startup-cql" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
-				<!-- TODO: cql could come from a resource via a resource attribute... -->
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 Arbitrary CQL script to be executed against the system keyspace during bean initialization.  Multiple elements will be executed in document order.
@@ -144,7 +128,6 @@ Arbitrary CQL script to be executed against the system keyspace during bean init
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="shutdown-cql" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
-				<!-- TODO: cql could come from a resource via a resource attribute... -->
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 Arbitrary CQL script to be executed against the system keyspace during bean destruction.  Multiple elements will be executed in document order.
@@ -581,7 +564,6 @@ If the utilisation of opened connections drops below by this configured threshol
 	<xsd:complexType name="sessionType">
 		<xsd:sequence>
 			<xsd:element name="startup-cql" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
-				<!-- TODO: cql could come from a resource via a resource attribute... -->
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 Arbitrary CQL script to be executed against the session's keyspace during bean initialization.  Multiple elements will be executed in document order.
@@ -589,7 +571,6 @@ Arbitrary CQL script to be executed against the session's keyspace during bean i
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="shutdown-cql" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
-				<!-- TODO: cql could come from a resource via a resource attribute... -->
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 Arbitrary CQL script to be executed against the session's keyspace during bean destruction.  Multiple elements will be executed in document order.
diff --git a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd
index 4f43e7ead..6ad5d4e18 100644
--- a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd
+++ b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd
@@ -7,13 +7,13 @@
 			elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans"
-				schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd" />
+				schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"
-				schemaLocation="http://www.springframework.org/schema/tool/spring-tool.xsd" />
+				schemaLocation="http://www.springframework.org/schema/tool/spring-tool.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/context"
-				schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd" />
+				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" />
+				schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
@@ -75,28 +75,6 @@ Defines a CassandraTemplate.
 		<xsd:union memberTypes="xsd:string" />
 	</xsd:simpleType>
 
-	<xsd:simpleType name="executorRef" final="union">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation kind="ref">
-					<tool:assignable-to type="java.util.concurrent.Executor"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:union memberTypes="xsd:string" />
-	</xsd:simpleType>
-
-	<xsd:simpleType name="sessionRef" final="union">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation kind="ref">
-					<tool:assignable-to type="com.datastax.driver.core.Session" />
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:union memberTypes="xsd:string" />
-	</xsd:simpleType>
-
 	<xsd:complexType name="clusterType">
 		<xsd:sequence>
 			<xsd:element name="local-pooling-options" type="poolingOptionsType" minOccurs="0" maxOccurs="1">
@@ -151,22 +129,68 @@ The name of the Cassandra Cluster definition; default is "cassandra-cluster".
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="address-translator-ref" use="optional">
+		<xsd:attribute name="contact-points" type="xsd:string"
+					   use="optional" default="localhost">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-Configures the address translator to use for the new cluster.
+The comma separated list of Cassandra servers. Default is "localhost".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="port" type="xsd:string" use="optional"
+					   default="9042">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The native CQL port to connect to.  Default is 9042.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="compression" default="NONE" use="optional"
+					   type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The protocol compression option. Default is "NONE".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="username" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+When Authentication is enabled, the username to use when connecting to the Cluster.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="password" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+When Authentication is enabled, the password to use when connecting to the Cluster.
+				]]>
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="metrics-enabled" type="xsd:string"
+					   default="true">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Determine whether or not to collect metrics.  Defaults to true.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="jmx-reporting-enabled" type="xsd:string"
+					   default="true">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Determine whether or not to enable JMX Reporting.  Defaults to true.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="ssl-enabled" type="xsd:string"
+					   default="false">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Determine if SSL is used for Cassandra communication. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:assignable-to type="com.datastax.driver.core.policies.AddressTranslator"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string"/>
-			</xsd:simpleType>
 		</xsd:attribute>
 		<xsd:attribute name="auth-info-provider-ref" use="optional">
 			<xsd:annotation>
@@ -178,119 +202,13 @@ AuthInfoProvider implementation.
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:assignable-to type="com.datastax.driver.core.AuthInfoProvider" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
-			</xsd:simpleType>
-		</xsd:attribute>
-		<xsd:attribute name="cluster-builder-configurer-ref" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Sets the ClusterBuilderConfigurer used to apply additional configuration logic
-to the com.datastax.driver.core.Cluster.Builder.
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:assignable-to type="org.springframework.cassandra.config.ClusterBuilderConfigurer"/>
+							<tool:assignable-to type="com.datastax.driver.core.AuthInfoProvider"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
 				<xsd:union memberTypes="xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
-		<xsd:attribute name="cluster-name" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-An optional name for the create cluster.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="compression" type="xsd:string" default="NONE" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The protocol compression option. Default is "NONE".
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="contact-points" type="xsd:string" default="localhost" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The comma separated list of Cassandra servers.  Default is "localhost".
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="heartbeat-interval-seconds" type="xsd:string" default="30" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Pooling option to set the heartbeat interval seconds, after which a message is sent on an idle connection
-to make sure it's still alive. Applies to both local and remote pooling options (see
-com.datastax.driver.core.HostDistance and com.datastax.driver.core.PoolingOptions) for more details.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="host-state-listener-ref" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Custom Host State Listener for the Cassandra Cluster.
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:assignable-to type="com.datastax.driver.core.Host.StateListener" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
-			</xsd:simpleType>
-		</xsd:attribute>
-		<xsd:attribute name="idle-timeout-seconds" type="xsd:string" default="120" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Pooling option to set the timeout in seconds before an idle connection is removed. Applies to both local and remote
-pooling options (see com.datastax.driver.core.HostDistance and com.datastax.driver.core.PoolingOptions) for more details.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="initialization-executor-ref" type="executorRef" use="optional">
-			<xsd:annotation>
-				<xsd:documentation source="org.springframework.cassandra.config.PoolingOptionsFactoryBean"><![CDATA[
-Pooling option defining a reference to an Executor used to initialize the Cassandra Pool. Applies to both local
-and remote pooling options (see com.datastax.driver.core.HostDistance
-and com.datastax.driver.core.PoolingOptions) for more details.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="jmx-reporting-enabled" type="xsd:string" default="true">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Determine whether or not to enable JMX Reporting.  Defaults to true.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="latency-tracker-ref" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Custom Latency Tracker for the Cassandra Cluster.
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:assignable-to type="com.datastax.driver.core.LatencyTracker" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
-			</xsd:simpleType>
-		</xsd:attribute>
 		<xsd:attribute name="load-balancing-policy-ref" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -302,80 +220,13 @@ LoadBalancingPolicy implementation.
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
 							<tool:assignable-to
-								type="com.datastax.driver.core.policies.LoadBalancingPolicy" />
+									type="com.datastax.driver.core.policies.LoadBalancingPolicy"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
+				<xsd:union memberTypes="xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
-		<xsd:attribute name="netty-options-ref" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-NettyOptions implementation reference.
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:assignable-to
-								type="com.datastax.driver.core.NettyOptions" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
-			</xsd:simpleType>
-		</xsd:attribute>
-		<xsd:attribute name="max-queue-size" type="xsd:string" default="256" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Sets the maximum number of requests that get enqueued if no connection is available.
-If the queue grows past this value, new requests will be rejected immediately (and the driver will move to the
-next host in the query plan). This limit is per connection pool, not global to the driver.
-See com.datastax.driver.core.PoolingOption for more details. Available since Cassandra Driver 3.1.1.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="max-schema-agreement-wait-seconds" type="xsd:string" default="10" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Sets the maximum time to wait for schema agreement before returning from a DDL query. Defaults to 10 seconds.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="metrics-enabled" type="xsd:string"
-					   default="true">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Determine whether or not to collect metrics.  Defaults to true.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="password" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-When Authentication is enabled, the password to use when connecting to the Cluster.
-				]]>
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pool-timeout-milliseconds" type="xsd:string" default="5000" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Pooling option to set the timeout in milliseconds when trying to acquire a connection from a host's pool. Applies to
-both local and remote pooling options (see com.datastax.driver.core.HostDistance
-and com.datastax.driver.core.PoolingOptions) for more details.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="port" type="xsd:string" use="optional" default="9042">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The native CQL port to connect to.  Default is 9042.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 		<xsd:attribute name="reconnection-policy-ref" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -387,11 +238,11 @@ ReconnectionPolicy implementation.
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
 							<tool:assignable-to
-								type="com.datastax.driver.core.policies.ReconnectionPolicy" />
+									type="com.datastax.driver.core.policies.ReconnectionPolicy"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
+				<xsd:union memberTypes="xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
 		<xsd:attribute name="retry-policy-ref" use="optional">
@@ -405,37 +256,13 @@ RetryPolicy implementation.
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
 							<tool:assignable-to
-								type="com.datastax.driver.core.policies.RetryPolicy" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
-			</xsd:simpleType>
-		</xsd:attribute>
-		<xsd:attribute name="speculative-execution-policy-ref" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Configures the speculative execution policy to use for the new cluster.
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:assignable-to type="com.datastax.driver.core.policies.SpeculativeExecutionPolicy"/>
+									type="com.datastax.driver.core.policies.RetryPolicy"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
 				<xsd:union memberTypes="xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
-		<xsd:attribute name="ssl-enabled" type="xsd:string" default="false">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Determine if SSL is used for Cassandra communication. Defaults to false.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 		<xsd:attribute name="ssl-options-ref" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -446,100 +273,74 @@ Custom SSL Options. sslEnabled must be true for sslOptions to be used.
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:assignable-to type="com.datastax.driver.core.SSLOptions" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-				<xsd:union memberTypes="xsd:string" />
-			</xsd:simpleType>
-		</xsd:attribute>
-		<xsd:attribute name="timestamp-generator-ref" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Configures the generator that will produce the client-side timestamp sent with each query.
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:assignable-to type="com.datastax.driver.core.TimestampGenerator"/>
+							<tool:assignable-to type="com.datastax.driver.core.SSLOptions"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
 				<xsd:union memberTypes="xsd:string"/>
 			</xsd:simpleType>
 		</xsd:attribute>
-		<xsd:attribute name="username" type="xsd:string" use="optional">
+		<xsd:attribute name="host-state-listener-ref" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-When Authentication is enabled, the username to use when connecting to the Cluster.
+Custom Host State Listener for the Cassandra Cluster.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="datacenterType">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
-Provides the ability to specify replication factors by data center.
-					]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="name" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The name of the data center.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="replication-factor" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The replication factor for the data center.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="keyspaceType">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
-Provides the ability to define keyspaces.
-					]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="replication" type="replicationType" minOccurs="0" maxOccurs="1">
+			<xsd:simpleType>
 				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-Provides the ability to configure the keyspace's replication settings.
-					]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="com.datastax.driver.core.Host.StateListener"/>
+						</tool:annotation>
+					</xsd:appinfo>
 				</xsd:annotation>
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="action" use="required" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The keyspace action to take at startup and possibly shutdown.
-				]]></xsd:documentation>
-			</xsd:annotation>
+				<xsd:union memberTypes="xsd:string"/>
+			</xsd:simpleType>
 		</xsd:attribute>
-		<xsd:attribute name="durable-writes" type="xsd:string" use="optional" default="false">
+		<xsd:attribute name="latency-tracker-ref" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-Whether or not the keyspace supports durable writes.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="name" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The name of this keyspace.  Required.
+Custom Latency Tracker for the Cassandra Cluster.
 				]]></xsd:documentation>
 			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="com.datastax.driver.core.LatencyTracker"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+				<xsd:union memberTypes="xsd:string"/>
+			</xsd:simpleType>
 		</xsd:attribute>
 	</xsd:complexType>
+	<xsd:simpleType name="sessionRef" final="union">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="com.datastax.driver.core.Session"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
 
 	<xsd:complexType name="poolingOptionsType">
+		<xsd:attribute name="min-simultaneous-requests" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+If the utilisation of opened connections drops below by this configured threshold, then cassandra drops connections till core-connections.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="max-simultaneous-requests" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+If the utilisation of connections reaches this configurable threshold, then cassandra creates more connections up to max-connections.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
 		<xsd:attribute name="core-connections" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -554,107 +355,6 @@ More connections are created up to a configurable maximum number of connections.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="max-simultaneous-requests" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-If the utilisation of connections reaches this configurable threshold, then cassandra creates more connections up to max-connections.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="min-simultaneous-requests" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-If the utilisation of opened connections drops below by this configured threshold, then cassandra drops connections till core-connections.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="replicationType">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
-Provides the ability to configure the keyspace's replication settings.
-					]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="data-center" type="datacenterType" minOccurs="0" maxOccurs="unbounded">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-Provides the ability to specify replication factors by data center.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="class" type="xsd:string" use="optional" default="SimpleStrategy">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The name of the replication class; default is "SIMPLE_STRATEGY".
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="replication-factor" type="xsd:string" use="optional" default="1">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The replication factor; default is 1.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="sessionType">
-		<xsd:sequence>
-			<xsd:element name="startup-cql" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
-				<!-- TODO: cql could come from a resource via a resource attribute... -->
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-Arbitrary CQL script to be executed against the session's keyspace during bean initialization.  Multiple elements will be executed in document order.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="shutdown-cql" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
-				<!-- TODO: cql could come from a resource via a resource attribute... -->
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-Arbitrary CQL script to be executed against the session's keyspace during bean destruction.  Multiple elements will be executed in document order.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The name of the session definition; default is "cassandra-session".
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="cassandra-converter-ref" type="cassandraConverterRef" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The reference to a CassandraConverter; default is "cassandraConverter".
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="cluster-ref" type="clusterRef" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The reference to a Cassandra cluster; default is "cassandra-cluster".
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="keyspace-name" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The name of a Cassandra Keyspace.  No default; for the system keyspace, use the empty string.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="schema-action" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The schema action to perform; default is NONE.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="socketOptionsType">
@@ -679,13 +379,6 @@ Sets read timeout for client socket in milliseconds.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="receive-buffer-size" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Sets the SO_RCVBUF socket option.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 		<xsd:attribute name="reuse-address" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -693,13 +386,6 @@ Sets the SO_REUSEADDR socket option.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="send-buffer-size" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Sets the SO_SNDBUF socket option.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 		<xsd:attribute name="so-linger" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -714,6 +400,82 @@ Sets the SO_TCPNODELAY socket option.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
+		<xsd:attribute name="receive-buffer-size" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the SO_RCVBUF socket option.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="send-buffer-size" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the SO_SNDBUF socket option.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:complexType name="sessionType">
+		<xsd:sequence>
+			<xsd:element name="startup-cql" type="xsd:string"
+						 minOccurs="0" maxOccurs="unbounded">
+				<!-- TODO: cql could come from a resource via a resource attribute... -->
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Arbitrary CQL script to be executed against the session's keyspace during bean initialization.  Multiple elements will be executed in document order.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="shutdown-cql" type="xsd:string"
+						 minOccurs="0" maxOccurs="unbounded">
+				<!-- TODO: cql could come from a resource via a resource attribute... -->
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Arbitrary CQL script to be executed against the session's keyspace during bean destruction.  Multiple elements will be executed in document order.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+
+		<xsd:attribute name="id" type="xsd:ID" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of the session definition; default is "cassandra-session".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-ref" type="clusterRef" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The reference to a Cassandra cluster; default is "cassandra-cluster".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="keyspace-name" type="xsd:string"
+					   use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of a Cassandra Keyspace.  No default; for the system keyspace, use the empty string.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cassandra-converter-ref" type="cassandraConverterRef"
+					   use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The reference to a CassandraConverter; default is "cassandraConverter".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="schema-action" type="xsd:string"
+					   use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The schema action to perform; default is NONE.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="templateType">
@@ -724,13 +486,6 @@ The name of the template; default is "cassandraTemplate".
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="cassandra-converter-ref" type="cassandraConverterRef" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The reference to a CassandraConverter; default is "cassandraConverter".
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 		<xsd:attribute name="session-ref" type="sessionRef" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -738,8 +493,197 @@ The reference to a Cassandra session; default is "cassandra-session".
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
+		<xsd:attribute name="cassandra-converter-ref" type="cassandraConverterRef"
+					   use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The reference to a CassandraConverter; default is "cassandraConverter".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
 	</xsd:complexType>
 
+	<xsd:complexType name="keyspaceType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Provides the ability to define keyspaces.
+					]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="replication" type="replicationType"
+						 minOccurs="0" maxOccurs="1">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Provides the ability to configure the keyspace's replication settings.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="name" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of this keyspace.  Required.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="action" use="required" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The keyspace action to take at startup and possibly shutdown.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="durable-writes" type="xsd:string"
+					   use="optional" default="false">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Whether or not the keyspace supports durable writes.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:complexType name="replicationType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Provides the ability to configure the keyspace's replication settings.
+					]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="data-center" type="datacenterType"
+						 minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Provides the ability to specify replication factors by data center.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="class" type="xsd:string" use="optional"
+					   default="SimpleStrategy">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of the replication class; default is "SIMPLE_STRATEGY".
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="replication-factor" type="xsd:string"
+					   use="optional" default="1">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The replication factor; default is 1.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+	<xsd:complexType name="datacenterType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Provides the ability to specify replication factors by data center.
+					]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="name" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of the data center.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="replication-factor" type="xsd:string"
+					   use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The replication factor for the data center.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:simpleType name="cassandraConverterRef" final="union">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to
+							type="org.springframework.data.cassandra.convert.CassandraConverter"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:complexType name="entityType">
+		<xsd:sequence>
+			<xsd:element name="table" type="tableType" minOccurs="0"
+						 maxOccurs="1">
+			</xsd:element>
+			<xsd:element name="property" type="propertyType"
+						 minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:sequence>
+		<xsd:attribute name="class" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Entity class name.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:complexType name="tableType">
+		<xsd:attribute name="name" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Table name override.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+
+		<xsd:attribute name="force-quote" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Whether to force-quote the table name.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+
+		<!-- TODO: allow specification of C* table options here -->
+	</xsd:complexType>
+
+	<xsd:complexType name="propertyType">
+		<xsd:attribute name="name" use="required" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of the property.  Required.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="column-name" use="optional" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The column-name that the property should be mapped to.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="force-quote" use="optional" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Whether the column name should be force-quoted.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:simpleType name="cassandraTemplateRef" final="union">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to
+							type="org.springframework.data.cassandra.core.CassandraTemplate"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
 	<xsd:attributeGroup name="cassandra-repository-attributes">
 		<xsd:attribute name="cassandra-template-ref" type="cassandraTemplateRef">
 			<xsd:annotation>
@@ -754,47 +698,13 @@ The reference to a cassandraTemplate. Will default to 'cassandraTemplate'.
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="repository:repositories">
-					<xsd:attributeGroup ref="cassandra-repository-attributes" />
-					<xsd:attributeGroup ref="repository:repository-attributes" />
+					<xsd:attributeGroup ref="cassandra-repository-attributes"/>
+					<xsd:attributeGroup ref="repository:repository-attributes"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:simpleType name="cassandraTemplateRef" final="union">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation kind="ref">
-					<tool:assignable-to
-						type="org.springframework.data.cassandra.core.CassandraTemplate" />
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:union memberTypes="xsd:string"/>
-	</xsd:simpleType>
-
-	<xsd:element name="converter">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
-Defines a CassandraConverter for getting rich mapping functionality.
-			]]></xsd:documentation>
-			<xsd:appinfo>
-				<tool:exports
-					type="org.springframework.data.cassandra.convert.CassandraConverter" />
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:attribute name="mapping-ref" type="mappingContextRef" use="optional">
-				<xsd:annotation>
-					<xsd:documentation
-						source="org.springframework.data.cassandra.mapping.CassandraMappingContext"><![CDATA[
-The reference to a CassandraMappingContext. Will default to 'cassandraMapping'.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
 	<xsd:element name="mapping">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -802,128 +712,57 @@ Defines a CassandraMappingContext for holding rich entity mapping information.
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:exports
-					type="org.springframework.data.cassandra.mapping.CassandraMappingContext" />
+						type="org.springframework.data.cassandra.mapping.CassandraMappingContext"/>
 			</xsd:appinfo>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element name="entity" type="entityType" minOccurs="0" maxOccurs="unbounded" />
-				<xsd:element name="user-type-resolver" type="userTypeResolverType" minOccurs="0" maxOccurs="1" />
+				<xsd:element name="entity" type="entityType" minOccurs="0"
+							 maxOccurs="unbounded"/>
 			</xsd:sequence>
-			<xsd:attribute name="entity-base-packages" type="xsd:string" use="optional">
+			<xsd:attribute name="entity-base-packages" type="xsd:string"
+						   use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 The comma-delimited base packages in which to scan for entities and their mapping information.
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="user-type-resolver-ref" type="xsd:string" use="optional">
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="converter">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a CassandraConverter for getting rich mapping functionality.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:exports
+						type="org.springframework.data.cassandra.convert.CassandraConverter"/>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="mapping-ref" type="mappingContextRef"
+						   use="optional">
 				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-The reference to a UserTypeResolver. UserTypeResolver is required when working with User-defined types.
+					<xsd:documentation
+							source="org.springframework.data.cassandra.mapping.CassandraMappingContext"><![CDATA[
+The reference to a CassandraMappingContext. Will default to 'cassandraMapping'.
 					]]></xsd:documentation>
-					<xsd:appinfo>
-						<tool:exports
-							type="org.springframework.data.cassandra.mapping.UserTypeResolver" />
-					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:simpleType name="cassandraConverterRef" final="union">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation kind="ref">
-					<tool:assignable-to type="org.springframework.data.cassandra.convert.CassandraConverter"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:union memberTypes="xsd:string"/>
-	</xsd:simpleType>
-
 	<xsd:simpleType name="mappingContextRef">
 		<xsd:annotation>
 			<xsd:appinfo>
 				<tool:annotation kind="ref">
-					<tool:assignable-to type="org.springframework.data.cassandra.mapping.CassandraMappingContext"/>
+					<tool:assignable-to
+							type="org.springframework.data.cassandra.mapping.CassandraMappingContext"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
 		<xsd:union memberTypes="xsd:string"/>
 	</xsd:simpleType>
-
-	<xsd:complexType name="entityType">
-		<xsd:sequence>
-			<xsd:element name="table" type="tableType" minOccurs="0" maxOccurs="1" />
-			<xsd:element name="property" type="propertyType" minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-		<xsd:attribute name="class" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Entity class name.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="propertyType">
-		<xsd:attribute name="column-name" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The column-name that the property should be mapped to.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="force-quote" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Whether the column name should be force-quoted.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="name" type="xsd:string" use="required" >
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The name of the property.  Required.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="tableType">
-		<xsd:attribute name="force-quote" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Whether to force-quote the table name.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="name" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Table name override.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<!-- TODO: allow specification of C* table options here -->
-	</xsd:complexType>
-
-	<xsd:complexType name="userTypeResolverType">
-		<xsd:attribute name="keyspace-name" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The name of a Cassandra Keyspace.  No default; for the system keyspace, use the empty string.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="cluster-ref" type="clusterRef" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The reference to a Cassandra cluster; default is "cassandra-cluster".
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
 </xsd:schema>
diff --git a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.5.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.5.xsd
index 3388f4c8a..9ac6ce276 100644
--- a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.5.xsd
+++ b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.5.xsd
@@ -1,19 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2016 the original author or authors.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 <xsd:schema xmlns="http://www.springframework.org/schema/data/cassandra"
 			xmlns:repository="http://www.springframework.org/schema/data/repository"
 			xmlns:tool="http://www.springframework.org/schema/tool"
@@ -53,7 +38,7 @@ Defines a Cassandra cluster.
 	<xsd:element name="session" type="sessionType">
 		<xsd:annotation>
 			<xsd:documentation
-				source="org.springframework.data.cassandra.config.xml.CassandraDataSessionFactoryBean"><![CDATA[
+				source="org.springframework.data.cassandra.config.CassandraSessionFactoryBean"><![CDATA[
 Defines a Cassandra session.
 			]]></xsd:documentation>
 			<xsd:appinfo>
@@ -67,7 +52,7 @@ Defines a Cassandra session.
 	<xsd:element name="template" type="templateType">
 		<xsd:annotation>
 			<xsd:documentation
-				source="org.springframework.data.cassandra.config.xml.CassandraDataTemplateFactoryBean"><![CDATA[
+				source="org.springframework.data.cassandra.config.CassandraTemplateFactoryBean"><![CDATA[
 Defines a CassandraTemplate.
 			]]></xsd:documentation>
 			<xsd:appinfo>
@@ -143,7 +128,6 @@ Provides the ability to define a keyspace.
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="startup-cql" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
-				<!-- TODO: cql could come from a resource via a resource attribute... -->
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 Arbitrary CQL script to be executed against the system keyspace during bean initialization.  Multiple elements will be executed in document order.
@@ -151,7 +135,6 @@ Arbitrary CQL script to be executed against the system keyspace during bean init
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="shutdown-cql" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
-				<!-- TODO: cql could come from a resource via a resource attribute... -->
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 Arbitrary CQL script to be executed against the system keyspace during bean destruction.  Multiple elements will be executed in document order.
@@ -619,7 +602,6 @@ The replication factor; default is 1.
 	<xsd:complexType name="sessionType">
 		<xsd:sequence>
 			<xsd:element name="startup-cql" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
-				<!-- TODO: cql could come from a resource via a resource attribute... -->
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 Arbitrary CQL script to be executed against the session's keyspace during bean initialization.  Multiple elements will be executed in document order.
@@ -627,7 +609,6 @@ Arbitrary CQL script to be executed against the session's keyspace during bean i
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="shutdown-cql" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
-				<!-- TODO: cql could come from a resource via a resource attribute... -->
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 Arbitrary CQL script to be executed against the session's keyspace during bean destruction.  Multiple elements will be executed in document order.
@@ -921,7 +902,6 @@ Table name override.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<!-- TODO: allow specification of C* table options here -->
 	</xsd:complexType>
 
 	<xsd:complexType name="userTypeResolverType">