diff --git a/doc/reference/src/dbprovider.xml b/doc/reference/src/dbprovider.xml
index c6185546..30be6d9d 100644
--- a/doc/reference/src/dbprovider.xml
+++ b/doc/reference/src/dbprovider.xml
@@ -119,13 +119,13 @@
 
     <itemizedlist>
       <listitem>
-        <para><code>SqlServer-1.1</code> - Microsoft SQL Server, provider
+        <para><literal>SqlServer-1.1</literal> - Microsoft SQL Server, provider
         V1.0.5000.0 in framework .NET V1.1</para>
       </listitem>
 
       <listitem>
-        <para><code>SqlServer-2.0</code> (aliased to
-        <code>System.Data.SqlClient</code>) - Microsoft SQL Server, provider
+        <para><literal>SqlServer-2.0</literal> (aliased to
+        <literal>System.Data.SqlClient</literal>) - Microsoft SQL Server, provider
         V2.0.0.0 in framework .NET V2.0</para>
       </listitem>
 
@@ -141,35 +141,35 @@
       </listitem>
 
       <listitem>
-        <para><code>OleDb-1.1</code> - OleDb, provider V1.0.5000.0 in
+        <para><literal>OleDb-1.1</literal> - OleDb, provider V1.0.5000.0 in
         framework .NET V1.1</para>
       </listitem>
 
       <listitem>
-        <para><code>OleDb-2.0</code> (aliased to
-        <code>System.Data.OleDb</code>) - OleDb, provider V2.0.0.0 in
+        <para><literal>OleDb-2.0</literal> (aliased to
+        <literal>System.Data.OleDb</literal>) - OleDb, provider V2.0.0.0 in
         framework .NET V2.0</para>
       </listitem>
 
       <listitem>
-        <para><code>OracleClient-2.0</code> (aliased to
-        <code>System.Data.OracleClient</code>) - Oracle, Microsoft provider
+        <para><literal>OracleClient-2.0</literal> (aliased to
+        <literal>System.Data.OracleClient</literal>) - Oracle, Microsoft provider
         V2.0.0.0</para>
       </listitem>
 
       <listitem>
-        <para><code>OracleODP-2.0</code> (aliased to
-        <code>System.DataAccess.Client</code>) - Oracle, Oracle provider
+        <para><literal>OracleODP-2.0</literal> (aliased to
+        <literal>System.DataAccess.Client</literal>) - Oracle, Oracle provider
         V2.102.2.20 (Oracle 10g)</para>
       </listitem>
 
       <listitem>
-        <para><literal>OracleODP-11-2.0 </literal>- Oracle, Oracle provider
+        <para><literal>OracleODP-11-2.0</literal> - Oracle, Oracle provider
         V2.111.7.20 (Oracle 11g)</para>
       </listitem>
 
       <listitem>
-        <para><code>MySql</code> - MySQL, MySQL provider 1.0.10.1</para>
+        <para><literal>MySql</literal> - MySQL, MySQL provider 1.0.10.1</para>
       </listitem>
 
       <listitem>
@@ -188,7 +188,7 @@
       </listitem>
 
       <listitem>
-        <para><literal>MySql-5.1 </literal>- MySQL, MySQL provider
+        <para><literal>MySql-5.1</literal> - MySQL, MySQL provider
         5.1.2.2</para>
       </listitem>
 
@@ -198,10 +198,15 @@
       </listitem>
 
       <listitem>
-        <para><literal>MySql-5.2.3</literal> (aliased to
-        <literal>MySql.Data.MySqlClient</literal>) MySQL, MySQL provider
+        <para><literal>MySql-5.2.3</literal> - MySQL, MySQL provider
         5.2.3.0</para>
       </listitem>
+      
+      <listitem>
+        <para><literal>MySql-6.1.3</literal> (aliased to
+        <literal>MySql.Data.MySqlClient</literal>) - MySQL, MySQL provider
+        6.1.3.0</para>
+      </listitem>
 
       <listitem>
         <para><literal>Npgsql-1.0</literal> - Postgresql provider 1.0.0.0 (and
@@ -224,7 +229,7 @@
       </listitem>
 
       <listitem>
-        <para><literal>DB2-9.0.0-2.0 </literal>- (aliased to
+        <para><literal>DB2-9.0.0-2.0</literal> (aliased to
         <literal>IBM.Data.DB2</literal>) - IBM DB2 Data Provider 9.0.0 for
         .NET Framework 2.0</para>
       </listitem>
@@ -235,35 +240,50 @@
       </listitem>
 
       <listitem>
-        <para><literal>DB2-9.1.0.2</literal> - (aliased to
+        <para><literal>DB2-9.1.0.2</literal> (aliased to
         <literal>IBM.Data.DB2.9.1.0</literal>) - IBM DB2 Data Provider 9.1.0
         for .NET Framework 2.0</para>
       </listitem>
+      
+      <listitem>
+        <para><literal>iDB2-10.0.0.0</literal> - IBM iSeries DB2 Data Provider 10.0.0.0 
+        for .NET Framework 2.0</para>
+      </listitem>
 
       <listitem>
-        <para><literal>SQLite-1.0.43 </literal>SQLite provider 1.0.43 for .NET
+        <para><literal>SQLite-1.0.43</literal> - SQLite provider 1.0.43 for .NET
+        Framework 2.0</para>
+      </listitem>
+      
+      <listitem>
+        <para><literal>SQLite-1.0.44</literal> - SQLite provider 1.0.44 for .NET
         Framework 2.0</para>
       </listitem>
 
       <listitem>
-        <para><literal>SQLite-1.0.47 </literal>SQLite provider 1.0.47 for .NET
+        <para><literal>SQLite-1.0.47</literal> - SQLite provider 1.0.47 for .NET
+        Framework 2.0</para>
+      </listitem>
+      
+      <listitem>
+        <para><literal>SQLite-1.0.56</literal> - SQLite provider 1.0.56 for .NET 
         Framework 2.0</para>
       </listitem>
 
       <listitem>
-        <para><literal>SQLite-1.0.56 </literal>- (aliased to
-        System.Data.SQLite) - SQLite provider 1.0.56 for .NET Framework
+        <para><literal>SQLite-1.0.65</literal> (aliased to
+        System.Data.SQLite) - SQLite provider 1.0.65 for .NET Framework
         2.0</para>
 
         <note>
           <para>The default parameter prefix used in SQLite is : and not @,
-          please write your SQL accordingly or define a privider definition
+          please write your SQL accordingly or define a provider definition
           for SQLite.</para>
         </note>
       </listitem>
 
       <listitem>
-        <para><literal>Firebird-2.1</literal>- (aliased to
+        <para><literal>Firebird-2.1</literal> (aliased to
         <literal>Firebird-2.1</literal>) - Firebird Server, provider V2.1.0.0 in framework .NET V2.0</para>
       </listitem>
 
@@ -293,8 +313,9 @@
       </listitem>
 
       <listitem>
-        <para>InterSystems.Data.CacheClient - Caché provider Version 2.0.0.1
-        in framework .NET V2</para>
+        <para><literal>Cache-2.0.0.1</literal> (aliased to
+          <literal>InterSystems.Data.CacheClient</literal>) - Cache provider Version 2.0.0.1
+          in framework .NET V2</para>
       </listitem>
     </itemizedlist>
 
diff --git a/src/Spring/Spring.Data/Data/Common/dbproviders.xml b/src/Spring/Spring.Data/Data/Common/dbproviders.xml
index a1a2690b..5262fad8 100644
--- a/src/Spring/Spring.Data/Data/Common/dbproviders.xml
+++ b/src/Spring/Spring.Data/Data/Common/dbproviders.xml
@@ -6,8 +6,7 @@
 <objects xmlns='http://www.springframework.net'>
 
 	<!-- TODO Provide Schema to make it less verbose to configure -->
-
-
+  
 
   <!-- SQL SERVER -->
   
@@ -94,7 +93,7 @@
   <alias name="SqlServer-2.0" alias="System.Data.SqlClient"/>
 
   
-  <!-- SQL SERVER COMPACT EDITION 3.1 -->
+  <!-- SQL SERVER COMPACT EDITION -->
 
   <object id="SqlServerCe-3.1" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
     <constructor-arg name="dbMetaData">
@@ -422,7 +421,6 @@
     </constructor-arg>
   </object>
 
-
   
   <!-- My Sql -->
   
@@ -513,8 +511,7 @@
   </object>
 
 
-
-  <!-- Connector/NET 5.0 (.NET 2.0 only) -->
+  <!-- Connector/NET 5.x (.NET 2.0 only) -->
 
   <object id="MySql-5.0" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
     <constructor-arg name="dbMetaData">
@@ -600,9 +597,6 @@
     </constructor-arg>
   </object>
 
-
-  <!-- Connector/NET 5.1 (.NET 2.0 only) -->
-
   <object id="MySql-5.1" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
     <constructor-arg name="dbMetaData">
       <object type="Spring.Data.Common.DbMetadata">
@@ -728,8 +722,53 @@
       </object>
     </constructor-arg>
   </object>
+
+
+  <!-- Connector/NET 6.x (.NET 2.0 only) -->
   
-  <alias name="MySql-5.2.3" alias="MySql.Data.MySqlClient"/>
+  <object id="MySql-6.1.3" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="MySQL, MySQL provider 6.1.3.0"  />
+        <constructor-arg name="assemblyName" value="MySql.Data, Version=6.1.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="connectionType" value="MySql.Data.MySqlClient.MySqlConnection, MySql.Data, Version=6.1.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandType" value="MySql.Data.MySqlClient.MySqlCommand, MySql.Data, Version=6.1.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterType" value="MySql.Data.MySqlClient.MySqlParameter, MySql.Data, Version=6.1.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="dataAdapterType" value="MySql.Data.MySqlClient.MySqlDataAdapter, MySql.Data, Version=6.1.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderType" value="MySql.Data.MySqlClient.MySqlCommandBuilder, MySql.Data, Version=6.1.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="MySql.Data.MySqlClient.MySqlDbType, MySql.Data, Version=6.1.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterDbTypeProperty" value="MySqlDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="@"/>
+        <constructor-arg name="exceptionType" value="MySql.Data.MySqlClient.MySqlException, MySql.Data, Version=6.1.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Number.ToString()"/>
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>1054,1064,1146</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>1</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>630,839,840,893,1062,1169,1215,1216,1217,1451,1452,1557</value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>1205</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1213</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+  
+  <alias name="MySql-6.1.3" alias="MySql.Data.MySqlClient"/>
 
 
   <object id="Npgsql-1.0" type="Spring.Data.Common.DbProvider, Spring.Data"  singleton="false">
@@ -822,7 +861,6 @@
     </constructor-arg>
   </object>
 
-
   <object id="Npgsql-2.0" type="Spring.Data.Common.DbProvider, Spring.Data"  singleton="false">
     <constructor-arg name="dbMetaData">
       <object type="Spring.Data.Common.DbMetadata, Spring.Data">
@@ -868,6 +906,7 @@
     </constructor-arg>
   </object>
   
+  
   <!-- DB2 9.0.0 for .NET 1.1 -->
   <object id="DB2-9.0.0-1.1" type="Spring.Data.Common.DbProvider, Spring.Data"  singleton="false">
     <constructor-arg name="DbMetaData">
@@ -966,6 +1005,7 @@
 
   <alias name="DB2-9.0.0-2.0" alias="IBM.Data.DB2"/>
 
+  
   <!-- DB2 9.1.0 for .NET 1.1 -->
   <object id="DB2-9.1.0-1.1" type="Spring.Data.Common.DbProvider, Spring.Data"  singleton="false">
     <constructor-arg name="DbMetaData">
@@ -1067,7 +1107,7 @@
   <alias name="DB2-9.1.0.2" alias="IBM.Data.DB2.9.1.0"/>
 
 
-  <!-- DB2 9.1.0 for .NET 2.0 -->
+  <!-- iDB2 10.0.0.0 for .NET 2.0 -->
   <object id="iDB2-10.0.0.0" type="Spring.Data.Common.DbProvider, Spring.Data"  singleton="false">
     <constructor-arg name="DbMetaData">
       <object type="Spring.Data.Common.DbMetadata, Spring.Data">
@@ -1093,7 +1133,6 @@
         <!-- error codes taken from http://publib.boulder.ibm.com/infocenter/iseries/v5r3/index.jsp?topic=/rzala/rzalaco.htm and 
              from Spring.Java sql-error-codes.xml -->
 
-
         <property name="ErrorCodes.BadSqlGrammarCodes">
           <value>-007,-029,-097,-104,-109,-115,-128,-199,-204,-206,-301,-408,-441,-491</value>
         </property>
@@ -1116,51 +1155,7 @@
     </constructor-arg>
   </object>
 
-  <!-- Sqlite + ADO Net provider for sqlite -->
-  <!-- Driver can be found at : http://sourceforge.net/projects/sqlite-dotnet2 -->
-  <!-- Reference for error codes : http://www.sqlite.org/capi3.html -->
-  <object id="SQLite-1.0.65" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
-    <constructor-arg name="dbMetaData">
-      <object type="Spring.Data.Common.DbMetadata">
-        <constructor-arg name="productName" value="SQLite"/>
-        <constructor-arg name="assemblyName" value="System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
-        <constructor-arg name="connectionType" value="System.Data.SQLite.SQLiteConnection, System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
-        <constructor-arg name="commandType" value="System.Data.SQLite.SQLiteCommand, System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
-        <constructor-arg name="parameterType" value="System.Data.SQLite.SQLiteParameter, System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
-        <constructor-arg name="dataAdapterType" value="System.Data.SQLite.SQLiteDataAdapter , System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
-        <constructor-arg name="commandBuilderType" value="System.Data.SQLite.SQLiteCommandBuilder, System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
-        <constructor-arg name="commandBuilderDeriveParametersMethod" value="not supported"/>
-        <constructor-arg name="parameterDbType" value="System.Data.SQLite.TypeAffinity, System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
-        <constructor-arg name="parameterDbTypeProperty" value="DbType"/>
-        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
-        <constructor-arg name="parameterNamePrefix" value=":"/>
-        <constructor-arg name="exceptionType" value="System.Data.SQLite.SQLiteException, System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
-        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
-        <constructor-arg name="useParameterPrefixInSql" value="true"/>
-        <constructor-arg name="bindByName" value="true"/>
-        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
-             obtaining error codes-->
-        <constructor-arg name="errorCodeExceptionExpression" value="Number.ToString()"/>
-
-        <property name="ErrorCodes.badSqlGrammarCodes">
-          <value></value>
-        </property>
-        <property name="ErrorCodes.DataAccessResourceFailureCodes">
-          <value>1</value>
-        </property>
-        <property name="ErrorCodes.DataIntegrityViolationCodes">
-          <value></value>
-        </property>
-        <property name="ErrorCodes.CannotAcquireLockCodes">
-          <value>15</value>
-        </property>
-        <property name="ErrorCodes.DeadlockLoserCodes">
-          <value>5,6</value>
-        </property>
-      </object>
-    </constructor-arg>
-  </object>
-
+  
   <!-- Sqlite + ADO Net provider for sqlite -->
   <!-- Driver can be found at : http://sourceforge.net/projects/sqlite-dotnet2 -->
   <!-- Reference for error codes : http://www.sqlite.org/capi3.html -->
@@ -1206,7 +1201,6 @@
     </constructor-arg>
   </object>
 
-
   <!-- Sqlite + ADO Net provider for sqlite -->
   <!-- Driver can be found at : http://sourceforge.net/projects/sqlite-dotnet2 -->
   <!-- Reference for error codes : http://www.sqlite.org/capi3.html -->
@@ -1341,15 +1335,62 @@
       </object>
     </constructor-arg>
   </object>
-  
-  <alias name="SQLite-1.0.56" alias="System.Data.SQLite"/>
 
+  <!-- Sqlite + ADO Net provider for sqlite -->
+  <!-- Driver can be found at : http://sourceforge.net/projects/sqlite-dotnet2 -->
+  <!-- Reference for error codes : http://www.sqlite.org/capi3.html -->
+  <object id="SQLite-1.0.65" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="SQLite"/>
+        <constructor-arg name="assemblyName" value="System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="connectionType" value="System.Data.SQLite.SQLiteConnection, System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="commandType" value="System.Data.SQLite.SQLiteCommand, System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="parameterType" value="System.Data.SQLite.SQLiteParameter, System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="dataAdapterType" value="System.Data.SQLite.SQLiteDataAdapter , System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="commandBuilderType" value="System.Data.SQLite.SQLiteCommandBuilder, System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="not supported"/>
+        <constructor-arg name="parameterDbType" value="System.Data.SQLite.TypeAffinity, System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="parameterDbTypeProperty" value="DbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value=":"/>
+        <constructor-arg name="exceptionType" value="System.Data.SQLite.SQLiteException, System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Number.ToString()"/>
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value></value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>1</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value></value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>15</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>5,6</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <alias name="SQLite-1.0.65" alias="System.Data.SQLite"/>
+
+  
   <!-- Firebird -->
+  
   <object id="Firebird-2.1" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false"> 
     <constructor-arg name="dbMetaData"> 
       <object type="Spring.Data.Common.DbMetadata"> 
-<constructor-arg name="productName" value="Firebird Server, provider V2.1.0.0 in framework .NET V2.0" /> 
-<constructor-arg name="assemblyName" value="FirebirdSql.Data.FirebirdClient, Version=2.1.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c"/> 
+        <constructor-arg name="productName" value="Firebird Server, provider V2.1.0.0 in framework .NET V2.0" /> 
+        <constructor-arg name="assemblyName" value="FirebirdSql.Data.FirebirdClient, Version=2.1.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c"/> 
         <constructor-arg name="connectionType" value="FirebirdSql.Data.FirebirdClient.FbConnection, FirebirdSql.Data.FirebirdClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c"/> 
         <constructor-arg name="commandType" value="FirebirdSql.Data.FirebirdClient.FbCommand, FirebirdSql.Data.FirebirdClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c"/> 
         <constructor-arg name="parameterType" value="FirebirdSql.Data.FirebirdClient.FbParameter, FirebirdSql.Data.FirebirdClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c"/> 
@@ -1472,7 +1513,6 @@
 
   <!-- used with ASE12.5 and ASE15 -->
   <object id="SybaseAse-AdoNet2" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
-
     <constructor-arg name="dbMetaData">
       <object type="Spring.Data.Common.DbMetadata">
         <constructor-arg name="productName" value="Sybase Adaptive Server Enterprise 15.0.2, provider V1.15.192.0"/>
diff --git a/src/Spring/Spring.Data/Data/Config/spring-database-1.1.xsd b/src/Spring/Spring.Data/Data/Config/spring-database-1.1.xsd
index 5bfb3ec3..bd0f751f 100644
--- a/src/Spring/Spring.Data/Data/Config/spring-database-1.1.xsd
+++ b/src/Spring/Spring.Data/Data/Config/spring-database-1.1.xsd
@@ -51,47 +51,6 @@
       </xs:simpleType>
       <xs:simpleType id="buildinProvider">
         <xs:restriction base="xs:string">
-          <xs:enumeration value="System.Data.SqlClient">
-            <xs:annotation>
-              <xs:documentation>Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0</xs:documentation>
-            </xs:annotation>
-          </xs:enumeration>
-          <xs:enumeration value="System.Data.SqlServerCe">
-            <xs:annotation>
-              <xs:documentation>Microsoft SQL Server Compact Edition, provider V3.5.1.0</xs:documentation>
-            </xs:annotation>
-          </xs:enumeration>
-          <xs:enumeration value="SqlServerCe-3.1">
-            <xs:annotation>
-              <xs:documentation>Microsoft SQL Server Compact Edition, provider V9.0.242.0</xs:documentation>
-            </xs:annotation>
-          </xs:enumeration>
-          <xs:enumeration value="System.Data.OleDb">
-            <xs:annotation>
-              <xs:documentation>OleDb, provider V2.0.0.0 in framework .NET V2.0</xs:documentation>
-            </xs:annotation>
-          </xs:enumeration>
-          <xs:enumeration value="System.Data.OracleClient">
-            <xs:annotation>
-              <xs:documentation>Oracle, Oracle provider V2.102.2.20</xs:documentation>
-            </xs:annotation>
-          </xs:enumeration>
-          <xs:enumeration value="Oracle.DataAccess.Client">
-            <xs:annotation>
-              <xs:documentation>Oracle, Oracle provider V2.102.2.20</xs:documentation>
-            </xs:annotation>
-          </xs:enumeration>
-          <xs:enumeration value="MySql.Data.MySqlClient">
-            <xs:annotation>
-              <xs:documentation>MySQL provider 5.2.3.0</xs:documentation>
-            </xs:annotation>
-          </xs:enumeration>
-          <xs:enumeration value="System.Data.SQLite">
-            <xs:annotation>
-              <xs:documentation>SQLite 1.0.47 provider</xs:documentation>
-            </xs:annotation>
-          </xs:enumeration>
-          
           <xs:enumeration value="SqlServer-1.1">
             <xs:annotation>
               <xs:documentation>Microsoft SQL Server, provider V1.0.5000.0 in framework .NET V1.1</xs:documentation>
@@ -102,11 +61,26 @@
               <xs:documentation>Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0</xs:documentation>
             </xs:annotation>
           </xs:enumeration>
+          <xs:enumeration value="System.Data.SqlClient">
+            <xs:annotation>
+              <xs:documentation>Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
           <xs:enumeration value="SqlServerCe-3.1">
             <xs:annotation>
               <xs:documentation>Microsoft SQL Server Compact Edition, provider V9.0.242.0</xs:documentation>
             </xs:annotation>
           </xs:enumeration>
+          <xs:enumeration value="SqlServerCe-3.5.1">
+            <xs:annotation>
+              <xs:documentation>Microsoft SQL Server Compact Edition, provider V3.5.1.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="System.Data.SqlServerCe">
+            <xs:annotation>
+              <xs:documentation>Microsoft SQL Server Compact Edition, provider V3.5.1.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
           <xs:enumeration value="OleDb-1.1">
             <xs:annotation>
               <xs:documentation>OleDb, provider V1.0.5000.0 in framework .NET V1.1</xs:documentation>
@@ -117,16 +91,36 @@
               <xs:documentation>OleDb, provider V2.0.0.0 in framework .NET V2.0</xs:documentation>
             </xs:annotation>
           </xs:enumeration>
+          <xs:enumeration value="System.Data.OleDb">
+            <xs:annotation>
+              <xs:documentation>OleDb, provider V2.0.0.0 in framework .NET V2.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
           <xs:enumeration value="OracleClient-2.0">
             <xs:annotation>
               <xs:documentation>Oracle, Microsoft provider V2.0.0.0</xs:documentation>
             </xs:annotation>
           </xs:enumeration>
+          <xs:enumeration value="System.Data.OracleClient">
+            <xs:annotation>
+              <xs:documentation>Oracle, Oracle provider V2.102.2.20</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
           <xs:enumeration value="OracleODP-2.0">
             <xs:annotation>
               <xs:documentation>Oracle, Oracle provider V2.102.2.20</xs:documentation>
             </xs:annotation>
           </xs:enumeration>
+          <xs:enumeration value="Oracle.DataAccess.Client">
+            <xs:annotation>
+              <xs:documentation>Oracle, Oracle provider V2.102.2.20</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="OracleODP-11-2.0">
+            <xs:annotation>
+              <xs:documentation>Oracle, Oracle provider V2.111.7.20</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>          
           <xs:enumeration value="MySql">
             <xs:annotation>
               <xs:documentation>MySQL provider 1.0.7.3007</xs:documentation>
@@ -157,6 +151,21 @@
               <xs:documentation>MySQL provider 5.1.4.0</xs:documentation>
             </xs:annotation>
           </xs:enumeration>
+          <xs:enumeration value="MySql-5.2.3">
+            <xs:annotation>
+              <xs:documentation>MySQL provider 5.2.3.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="MySql-6.1.3">
+            <xs:annotation>
+              <xs:documentation>MySQL provider 6.1.3.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="MySql.Data.MySqlClient">
+            <xs:annotation>
+              <xs:documentation>MySQL provider 6.1.3.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
           <xs:enumeration value="Npgsql-1.0">
             <xs:annotation>
               <xs:documentation>Npgsql provider 1.0.0.0</xs:documentation>
@@ -167,14 +176,9 @@
               <xs:documentation>Npgsql provider beta-1 1.98.1.0</xs:documentation>
             </xs:annotation>
           </xs:enumeration>
-          <xs:enumeration value="DB2-9.0.0-1.1">
+          <xs:enumeration value="Npgsql-2.0">
             <xs:annotation>
-              <xs:documentation>IBM DB2 Data Provider 9.0.0 for .NET Framework 1.1</xs:documentation>
-            </xs:annotation>
-          </xs:enumeration>
-          <xs:enumeration value="DB2-9.0.0-2.0">
-            <xs:annotation>
-              <xs:documentation>IBM DB2 Data Provider 9.0.0 for .NET Framework 2.0</xs:documentation>
+              <xs:documentation>Npgsql provider 2.0.0.0</xs:documentation>
             </xs:annotation>
           </xs:enumeration>
           <xs:enumeration value="DB2-9.1.0-1.1">
@@ -187,16 +191,16 @@
               <xs:documentation>IBM DB2 Data Provider 9.1.0 for .NET Framework 2.0</xs:documentation>
             </xs:annotation>
           </xs:enumeration>
+          <xs:enumeration value="IBM.Data.DB2.9.1.0">
+            <xs:annotation>
+              <xs:documentation>IBM DB2 Data Provider 9.1.0 for .NET Framework 2.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
           <xs:enumeration value="iDB2-10.0.0.0">
             <xs:annotation>
               <xs:documentation>IBM iSeries DB2 Data Provider 10.0.0.0</xs:documentation>
             </xs:annotation>
-          </xs:enumeration>
-          <xs:enumeration value="SQLite">
-            <xs:annotation>
-              <xs:documentation>Latest SQLite provider</xs:documentation>
-            </xs:annotation>
-          </xs:enumeration>          
+          </xs:enumeration>   
           <xs:enumeration value="SQLite-1.0.43">
             <xs:annotation>
               <xs:documentation>SQLite 1.0.43 provider</xs:documentation>
@@ -217,6 +221,26 @@
               <xs:documentation>SQLite 1.0.56 provider</xs:documentation>
             </xs:annotation>
           </xs:enumeration>
+          <xs:enumeration value="SQLite-1.0.65">
+            <xs:annotation>
+              <xs:documentation>SQLite 1.0.65 provider</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="System.Data.SQLite">
+            <xs:annotation>
+              <xs:documentation>SQLite 1.0.65 provider</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="Firebird-2.1">
+            <xs:annotation>
+              <xs:documentation>Firebird Server, provider V2.1.0.0 in framework .NET V2.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="FirebirdSql.Data.FirebirdClient">
+            <xs:annotation>
+              <xs:documentation>Firebird Server, provider V2.1.0.0 in framework .NET V2.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
           <xs:enumeration value="SybaseAse-12">
             <xs:annotation>
               <xs:documentation>Sybase ASE 12.5, 1.1.411 provider</xs:documentation>
@@ -242,6 +266,16 @@
               <xs:documentation>Microsoft ODBC, provider V2.0.0.0 in framework .NET V2</xs:documentation>
             </xs:annotation>
           </xs:enumeration>
+          <xs:enumeration value="Cache-2.0.0.1">
+            <xs:annotation>
+              <xs:documentation>InterSystems CacheConnection Version 2.0.0.1 in framework .NET V2</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="InterSystems.Data.CacheClient">
+            <xs:annotation>
+              <xs:documentation>InterSystems CacheConnection Version 2.0.0.1 in framework .NET V2</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
         </xs:restriction>
       </xs:simpleType>
     </xs:union>