diff --git a/src/NHibernate.Test/Async/CollectionTest/IdBagRelaxedFixture.cs b/src/NHibernate.Test/Async/CollectionTest/IdBagRelaxedFixture.cs
new file mode 100644
index 00000000000..aa3592bc921
--- /dev/null
+++ b/src/NHibernate.Test/Async/CollectionTest/IdBagRelaxedFixture.cs
@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace NHibernate.Test.CollectionTest
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class IdBagRelaxedFixtureAsync : TestCase
+	{
+		protected override string[] Mappings
+		{
+			get { return new string[] { "CollectionTest.IdBagRelaxedFixture.hbm.xml" }; }
+		}
+
+		protected override string MappingsAssembly
+		{
+			get { return "NHibernate.Test"; }
+		}
+
+		protected override void OnTearDown()
+		{
+			using( ISession s = OpenSession() )
+			{
+				s.Delete( "from A" );
+				s.Flush();
+			}
+		}
+
+		[Test]
+		public async Task SimpleAsync()
+		{
+			A a = new A();
+			a.Name = "first generic type";
+			a.Items = new List<string>();
+			a.Items.Add( "first string" );
+			a.Items.Add( "second string" );
+
+			ISession s = OpenSession();
+			await (s.SaveOrUpdateAsync( a ));
+			// this flush should test how NH wraps a generic collection with its
+			// own persistent collection
+			await (s.FlushAsync());
+			s.Close();
+			Assert.IsNotNull( a.Id );
+			Assert.AreEqual( "first string", ( string ) a.Items[ 0 ] );
+
+			s = OpenSession();
+			a = ( A ) await (s.LoadAsync( typeof( A ), a.Id ));
+			Assert.AreEqual( "first string", ( string ) a.Items[ 0 ], "first item should be 'first string'" );
+			Assert.AreEqual( "second string", ( string ) a.Items[ 1 ], "second item should be 'second string'" );
+			// ensuring the correct generic type was constructed
+			a.Items.Add( "third string" );
+			Assert.AreEqual( 3, a.Items.Count, "3 items in the list now" );
+
+			a.Items[ 1 ] = "new second string";
+			await (s.FlushAsync());
+			s.Close();
+		}
+	}
+}
diff --git a/src/NHibernate.Test/CollectionTest/IdBagFixture.hbm.xml b/src/NHibernate.Test/CollectionTest/IdBagFixture.hbm.xml
index a2efe22cae3..554d20239ec 100644
--- a/src/NHibernate.Test/CollectionTest/IdBagFixture.hbm.xml
+++ b/src/NHibernate.Test/CollectionTest/IdBagFixture.hbm.xml
@@ -5,12 +5,14 @@
 			<generator class="native" />
 		</id>
 		<property name="Name" column="aname" />
-		<idbag name="Items" cascade="all-delete-orphan">
-			<collection-id type="Int32" column="item_id">
-				<generator class="increment" />
-			</collection-id>
-			<key column="a_id" />
-			<element type="string" />
-		</idbag>
+    <idbag name="Items" cascade="all-delete-orphan">
+      <collection-id>
+        <column name="item_id" />
+        <generator class="increment" />
+        <type name="Int64" />
+      </collection-id>
+      <key column="a_id" />
+      <element type="string" />
+    </idbag>
 	</class>
 </hibernate-mapping>
diff --git a/src/NHibernate.Test/CollectionTest/IdBagRelaxedFixture.cs b/src/NHibernate.Test/CollectionTest/IdBagRelaxedFixture.cs
new file mode 100644
index 00000000000..e46f53686c1
--- /dev/null
+++ b/src/NHibernate.Test/CollectionTest/IdBagRelaxedFixture.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace NHibernate.Test.CollectionTest
+{
+	[TestFixture]
+	public class IdBagRelaxedFixture : TestCase
+	{
+		protected override string[] Mappings
+		{
+			get { return new string[] { "CollectionTest.IdBagRelaxedFixture.hbm.xml" }; }
+		}
+
+		protected override string MappingsAssembly
+		{
+			get { return "NHibernate.Test"; }
+		}
+
+		protected override void OnTearDown()
+		{
+			using( ISession s = OpenSession() )
+			{
+				s.Delete( "from A" );
+				s.Flush();
+			}
+		}
+
+		[Test]
+		public void Simple()
+		{
+			A a = new A();
+			a.Name = "first generic type";
+			a.Items = new List<string>();
+			a.Items.Add( "first string" );
+			a.Items.Add( "second string" );
+
+			ISession s = OpenSession();
+			s.SaveOrUpdate( a );
+			// this flush should test how NH wraps a generic collection with its
+			// own persistent collection
+			s.Flush();
+			s.Close();
+			Assert.IsNotNull( a.Id );
+			Assert.AreEqual( "first string", ( string ) a.Items[ 0 ] );
+
+			s = OpenSession();
+			a = ( A ) s.Load( typeof( A ), a.Id );
+			Assert.AreEqual( "first string", ( string ) a.Items[ 0 ], "first item should be 'first string'" );
+			Assert.AreEqual( "second string", ( string ) a.Items[ 1 ], "second item should be 'second string'" );
+			// ensuring the correct generic type was constructed
+			a.Items.Add( "third string" );
+			Assert.AreEqual( 3, a.Items.Count, "3 items in the list now" );
+
+			a.Items[ 1 ] = "new second string";
+			s.Flush();
+			s.Close();
+		}
+	}
+}
diff --git a/src/NHibernate.Test/CollectionTest/IdBagRelaxedFixture.hbm.xml b/src/NHibernate.Test/CollectionTest/IdBagRelaxedFixture.hbm.xml
new file mode 100644
index 00000000000..2a14b094cfe
--- /dev/null
+++ b/src/NHibernate.Test/CollectionTest/IdBagRelaxedFixture.hbm.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test" namespace="NHibernate.Test.CollectionTest">
+	<class name="A" table="a" lazy="false">
+		<id name="Id" column="id" unsaved-value="null">
+			<generator class="native" />
+		</id>
+		<property name="Name" column="aname" />
+		<idbag name="Items" cascade="all-delete-orphan">
+			<collection-id column="item_id" generator="increment" />
+			<key column="a_id" />
+			<element type="string" />
+		</idbag>
+	</class>
+</hibernate-mapping>
diff --git a/src/NHibernate.Test/MappingByCode/MappersTests/CollectionIdMapperTests.cs b/src/NHibernate.Test/MappingByCode/MappersTests/CollectionIdMapperTests.cs
index 1a09d569299..b4ab8f9f776 100644
--- a/src/NHibernate.Test/MappingByCode/MappersTests/CollectionIdMapperTests.cs
+++ b/src/NHibernate.Test/MappingByCode/MappersTests/CollectionIdMapperTests.cs
@@ -17,7 +17,8 @@ public void WhenCreateThenHasDefaultTypeAndGenerator()
 			var hbmId = new HbmCollectionId();
 			new CollectionIdMapper(hbmId);
 			Assert.That(hbmId.generator.@class, Is.Not.Null.And.Not.Empty);
-			Assert.That(hbmId.type, Is.Not.Null.And.Not.Empty);
+			Assert.That(hbmId.type1, Is.Not.Null.And.Not.Empty);
+			Assert.That(hbmId.type, Is.Null);
 		}
 
 		[Test]
@@ -27,7 +28,8 @@ public void WhenSetGeneratorThenChangeType()
 			new CollectionIdMapper(hbmId).Generator(Generators.HighLow);
 			
 			Assert.That(hbmId.generator.@class, Is.EqualTo("hilo"));
-			Assert.That(hbmId.type.ToLowerInvariant(), Does.Contain("int"));
+			Assert.That(hbmId.type1.ToLowerInvariant(), Does.Contain("int"));
+			Assert.That(hbmId.type, Is.Null);
 		}
 
 		[Test]
@@ -35,11 +37,12 @@ public void WhenForceTypeThenNotChangeType()
 		{
 			var hbmId = new HbmCollectionId();
 			var collectionIdMapper = new CollectionIdMapper(hbmId);
-			collectionIdMapper.Type((IIdentifierType) NHibernateUtil.Int64);
+			collectionIdMapper.Type(NHibernateUtil.Int64);
 			collectionIdMapper.Generator(Generators.HighLow);
 
 			Assert.That(hbmId.generator.@class, Is.EqualTo("hilo"));
-			Assert.That(hbmId.type, Is.EqualTo("Int64"));
+			Assert.That(hbmId.type1, Is.EqualTo("Int64"));
+			Assert.That(hbmId.type, Is.Null);
 		}
 
 		[Test]
diff --git a/src/NHibernate.Tool.HbmXsd/Program.cs b/src/NHibernate.Tool.HbmXsd/Program.cs
index a2f65fa016d..faf5a43d9ce 100644
--- a/src/NHibernate.Tool.HbmXsd/Program.cs
+++ b/src/NHibernate.Tool.HbmXsd/Program.cs
@@ -10,7 +10,7 @@ public class Program
 		private static void Main(string[] args)
 		{
 			string outFile = Path.GetFullPath(args.Length == 0
-				? @"..\..\..\..\NHibernate\Cfg\MappingSchema\Hbm.generated.cs"
+				? Path.Combine("..", "..", "..", "..", "NHibernate", "Cfg", "MappingSchema", "Hbm.generated.cs")
 				: args[0]);
 			if (!Directory.Exists(Path.GetDirectoryName(outFile)))
 			{
@@ -19,6 +19,7 @@ private static void Main(string[] args)
 				Environment.ExitCode = -1;
 				return;
 			}
+
 			var currentUiCulture = new CultureInfo("en-us");
 			Thread.CurrentThread.CurrentCulture = currentUiCulture;
 			Thread.CurrentThread.CurrentUICulture = currentUiCulture;
@@ -26,4 +27,4 @@ private static void Main(string[] args)
 			Console.WriteLine("Done");
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs b/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs
index 87ef712c658..933ac695ef7 100644
--- a/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs
+++ b/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs
@@ -2,7 +2,7 @@ namespace NHibernate.Cfg.MappingSchema {
     
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -83,7 +83,7 @@ public HbmAny() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -110,7 +110,7 @@ public HbmMeta() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -128,7 +128,7 @@ public partial class HbmMetaValue {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -193,7 +193,7 @@ public partial class HbmColumn {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -207,7 +207,7 @@ public partial class HbmComment {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -311,7 +311,7 @@ public partial class HbmArray {
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string where;
+        public string @where;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute("batch-size")]
@@ -366,7 +366,7 @@ public HbmArray() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -380,7 +380,7 @@ public partial class HbmSubselect {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -407,7 +407,7 @@ public HbmCache() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmCacheUsage {
@@ -434,7 +434,7 @@ public enum HbmCacheUsage {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmCacheInclude {
@@ -449,7 +449,7 @@ public enum HbmCacheInclude {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -463,7 +463,7 @@ public partial class HbmSynchronize {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -522,7 +522,7 @@ public HbmKey() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmOndelete {
@@ -537,7 +537,7 @@ public enum HbmOndelete {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -563,7 +563,7 @@ public partial class HbmIndex {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -584,7 +584,7 @@ public partial class HbmListIndex {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -616,7 +616,7 @@ public partial class HbmCompositeElement {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -634,7 +634,7 @@ public partial class HbmParent {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -766,7 +766,7 @@ public HbmManyToOne() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -780,7 +780,7 @@ public partial class HbmFormula {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmOuterJoinStrategy {
@@ -799,7 +799,7 @@ public enum HbmOuterJoinStrategy {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmFetchMode {
@@ -814,7 +814,7 @@ public enum HbmFetchMode {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmLaziness {
@@ -833,7 +833,7 @@ public enum HbmLaziness {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmNotFoundMode {
@@ -848,7 +848,7 @@ public enum HbmNotFoundMode {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -884,7 +884,7 @@ public partial class HbmNestedCompositeElement {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1005,7 +1005,7 @@ public HbmProperty() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1023,7 +1023,7 @@ public partial class HbmType {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1041,7 +1041,7 @@ public partial class HbmParam {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmPropertyGeneration {
@@ -1060,7 +1060,7 @@ public enum HbmPropertyGeneration {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1121,7 +1121,7 @@ public HbmElement() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1151,7 +1151,7 @@ public partial class HbmManyToAny {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1232,7 +1232,7 @@ public partial class HbmManyToMany {
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string where;
+        public string @where;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute("order-by")]
@@ -1249,7 +1249,7 @@ public HbmManyToMany() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1271,7 +1271,7 @@ public partial class HbmFilter {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmRestrictedLaziness {
@@ -1286,7 +1286,7 @@ public enum HbmRestrictedLaziness {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1317,7 +1317,7 @@ public HbmOneToMany() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1331,7 +1331,7 @@ public partial class HbmLoader {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1361,7 +1361,7 @@ public partial class HbmCustomSQL {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmCustomSQLCheck {
@@ -1380,7 +1380,7 @@ public enum HbmCustomSQLCheck {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmCollectionFetchMode {
@@ -1399,7 +1399,7 @@ public enum HbmCollectionFetchMode {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1510,7 +1510,7 @@ public partial class HbmBag {
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string where;
+        public string @where;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute("batch-size")]
@@ -1573,7 +1573,7 @@ public HbmBag() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmCollectionLazy {
@@ -1592,7 +1592,7 @@ public enum HbmCollectionLazy {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1754,7 +1754,7 @@ public partial class HbmClass {
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string where;
+        public string @where;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
@@ -1811,7 +1811,7 @@ public HbmClass() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1833,7 +1833,7 @@ public partial class HbmTuplizer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmTuplizerEntitymode {
@@ -1848,7 +1848,7 @@ public enum HbmTuplizerEntitymode {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1898,7 +1898,7 @@ public HbmCompositeId() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1957,7 +1957,7 @@ public HbmKeyManyToOne() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2002,7 +2002,7 @@ public partial class HbmKeyProperty {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmUnsavedValueType {
@@ -2021,7 +2021,7 @@ public enum HbmUnsavedValueType {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2077,7 +2077,7 @@ public partial class HbmId {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2095,7 +2095,7 @@ public partial class HbmGenerator {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2149,7 +2149,7 @@ public HbmDiscriminator() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2176,7 +2176,7 @@ public HbmNaturalId() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2266,7 +2266,7 @@ public HbmComponent() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2330,7 +2330,7 @@ public HbmDynamicComponent() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2446,7 +2446,7 @@ public partial class HbmList {
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string where;
+        public string @where;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute("batch-size")]
@@ -2509,7 +2509,7 @@ public HbmList() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2630,7 +2630,7 @@ public partial class HbmMap {
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string where;
+        public string @where;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute("batch-size")]
@@ -2697,7 +2697,7 @@ public HbmMap() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2716,7 +2716,7 @@ public partial class HbmCompositeIndex {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2735,7 +2735,7 @@ public partial class HbmCompositeMapKey {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2761,7 +2761,7 @@ public partial class HbmIndexManyToAny {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2791,7 +2791,7 @@ public partial class HbmIndexManyToMany {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2826,7 +2826,7 @@ public partial class HbmMapKey {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2861,7 +2861,7 @@ public partial class HbmMapKeyManyToMany {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2954,7 +2954,7 @@ public HbmOneToOne() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3040,7 +3040,7 @@ public partial class HbmPrimitiveArray {
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string where;
+        public string @where;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute("batch-size", DataType="positiveInteger")]
@@ -3090,7 +3090,7 @@ public HbmPrimitiveArray() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmPrimitivearrayOuterjoin {
@@ -3109,7 +3109,7 @@ public enum HbmPrimitivearrayOuterjoin {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmPrimitivearrayFetch {
@@ -3128,7 +3128,7 @@ public enum HbmPrimitivearrayFetch {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3239,7 +3239,7 @@ public partial class HbmSet {
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string where;
+        public string @where;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute("batch-size")]
@@ -3306,7 +3306,7 @@ public HbmSet() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3420,7 +3420,7 @@ public partial class HbmIdbag {
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string where;
+        public string @where;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute("batch-size")]
@@ -3483,7 +3483,7 @@ public HbmIdbag() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3502,21 +3502,33 @@ public partial class HbmCollectionId {
         /// <remarks/>
         public HbmGenerator generator;
         
+        /// <remarks/>
+        public HbmType type;
+        
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute("column")]
         public string column1;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string type;
+        [System.Xml.Serialization.XmlAttributeAttribute("type")]
+        [System.ComponentModel.DefaultValueAttribute("Int32")]
+        public string type1;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute(DataType="positiveInteger")]
         public string length;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute("generator")]
+        public string generator1;
+        
+        public HbmCollectionId() {
+            this.type1 = "Int32";
+        }
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3569,7 +3581,7 @@ public HbmTimestamp() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmTimestampUnsavedvalue {
@@ -3584,7 +3596,7 @@ public enum HbmTimestampUnsavedvalue {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmTimestampSource {
@@ -3599,7 +3611,7 @@ public enum HbmTimestampSource {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmVersionGeneration {
@@ -3614,7 +3626,7 @@ public enum HbmVersionGeneration {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3675,7 +3687,7 @@ public HbmVersion() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3727,7 +3739,7 @@ public HbmProperties() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3810,7 +3822,7 @@ public HbmJoin() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmJoinFetch {
@@ -3825,7 +3837,7 @@ public enum HbmJoinFetch {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3994,7 +4006,7 @@ public HbmJoinedSubclass() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4015,7 +4027,7 @@ public partial class HbmResultSet {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4046,7 +4058,7 @@ public HbmLoadCollection() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4068,7 +4080,7 @@ public partial class HbmReturnProperty {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4082,7 +4094,7 @@ public partial class HbmReturnColumn {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmLockMode {
@@ -4109,7 +4121,7 @@ public enum HbmLockMode {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4148,7 +4160,7 @@ public HbmReturn() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4162,7 +4174,7 @@ public partial class HbmReturnDiscriminator {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4193,7 +4205,7 @@ public HbmReturnJoin() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4211,7 +4223,7 @@ public partial class HbmReturnScalar {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4286,7 +4298,7 @@ public HbmQuery() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4304,7 +4316,7 @@ public partial class HbmQueryParam {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmFlushMode {
@@ -4327,7 +4339,7 @@ public enum HbmFlushMode {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmCacheMode {
@@ -4354,7 +4366,7 @@ public enum HbmCacheMode {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4444,7 +4456,7 @@ public HbmSqlQuery() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4588,7 +4600,7 @@ public HbmSubclass() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4746,7 +4758,7 @@ public HbmUnionSubclass() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmPolymorphismType {
@@ -4761,7 +4773,7 @@ public enum HbmPolymorphismType {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:nhibernate-mapping-2.2")]
     public enum HbmOptimisticLockMode {
@@ -4784,7 +4796,7 @@ public enum HbmOptimisticLockMode {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4798,7 +4810,7 @@ public partial class HbmCreate {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4818,7 +4830,7 @@ public partial class HbmDatabaseObject {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4836,7 +4848,7 @@ public partial class HbmDefinition {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4850,7 +4862,7 @@ public partial class HbmDrop {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4868,7 +4880,7 @@ public partial class HbmDialectScope {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4903,7 +4915,7 @@ public HbmFilterDef() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4921,7 +4933,7 @@ public partial class HbmFilterParam {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5010,7 +5022,7 @@ public HbmMapping() {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5032,7 +5044,7 @@ public partial class HbmTypedef {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.4.0-dev")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("HbmXsd", "5.6.0-dev+e75bff0485835ef162aadfbb6166d0162874f396")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
diff --git a/src/NHibernate/Cfg/MappingSchema/HbmCollectionId.cs b/src/NHibernate/Cfg/MappingSchema/HbmCollectionId.cs
index 644b078ef0e..b8339c2be2a 100644
--- a/src/NHibernate/Cfg/MappingSchema/HbmCollectionId.cs
+++ b/src/NHibernate/Cfg/MappingSchema/HbmCollectionId.cs
@@ -31,13 +31,14 @@ private IEnumerable<HbmColumn> AsColumns()
 			}
 		}
 
-		#region Implementation of ITypeMapping
-
 		public HbmType Type
 		{
-			get { return !string.IsNullOrEmpty(type) ? new HbmType { name = type } : null; }
+			get { return type ?? (!string.IsNullOrEmpty(type1) ? new HbmType { name = type1 } : null); }
 		}
 
-		#endregion
+		public HbmGenerator Generator
+		{
+			get { return string.IsNullOrEmpty(generator1) ? generator : new HbmGenerator { @class = generator1 }; }
+		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/NHibernate/Cfg/MappingSchema/HbmId.cs b/src/NHibernate/Cfg/MappingSchema/HbmId.cs
index cb4a7476311..68dc77917b3 100644
--- a/src/NHibernate/Cfg/MappingSchema/HbmId.cs
+++ b/src/NHibernate/Cfg/MappingSchema/HbmId.cs
@@ -49,5 +49,10 @@ public HbmType Type
 		}
 
 		#endregion
+
+		public HbmGenerator Generator
+		{
+			get { return string.IsNullOrEmpty(generator1) ? generator : new HbmGenerator { @class = generator1 }; }
+		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/NHibernate/Cfg/XmlHbmBinding/ClassIdBinder.cs b/src/NHibernate/Cfg/XmlHbmBinding/ClassIdBinder.cs
index 23618a368fc..909406a0e5c 100644
--- a/src/NHibernate/Cfg/XmlHbmBinding/ClassIdBinder.cs
+++ b/src/NHibernate/Cfg/XmlHbmBinding/ClassIdBinder.cs
@@ -32,7 +32,7 @@ public void BindId(HbmId idSchema, PersistentClass rootClass, Table table)
 				CreateIdentifierProperty(idSchema, rootClass, id);
 				VerifiyIdTypeIsValid(id.Type, rootClass.EntityName);
 
-				new IdGeneratorBinder(Mappings).BindGenerator(id, GetIdGenerator(idSchema));
+				new IdGeneratorBinder(Mappings).BindGenerator(id, idSchema.Generator);
 
 				id.Table.SetIdentifierValue(id);
 
@@ -66,11 +66,6 @@ private void CreateIdentifierProperty(HbmId idSchema, PersistentClass rootClass,
 			}
 		}
 
-		private HbmGenerator GetIdGenerator(HbmId idSchema)
-		{
-			return String.IsNullOrEmpty(idSchema.generator1) ? idSchema.generator : new HbmGenerator() { @class = idSchema.generator1 };
-		}
-
 		private static void VerifiyIdTypeIsValid(IType idType, string className)
 		{
 			if (idType == null)
diff --git a/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs b/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs
index 8984459d119..68b6d1cfb90 100644
--- a/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs
+++ b/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs
@@ -603,7 +603,7 @@ private void BindIdentifierCollectionSecondPass(HbmIdbag idbagMapping, Identifie
 			var id = new SimpleValue(model.CollectionTable);
 			new ValuePropertyBinder(id, Mappings).BindSimpleValue(idbagMapping.collectionid, IdentifierCollection.DefaultIdentifierColumnName);
 			model.Identifier = id;
-			new IdGeneratorBinder(Mappings).BindGenerator(id, idbagMapping.collectionid.generator);
+			new IdGeneratorBinder(Mappings).BindGenerator(id, idbagMapping.collectionid.Generator);
 			id.Table.SetIdentifierValue(id);
 		}
 
diff --git a/src/NHibernate/Mapping/ByCode/Impl/CollectionIdMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/CollectionIdMapper.cs
index 7ea3d38f160..2e87e6020f3 100644
--- a/src/NHibernate/Mapping/ByCode/Impl/CollectionIdMapper.cs
+++ b/src/NHibernate/Mapping/ByCode/Impl/CollectionIdMapper.cs
@@ -9,7 +9,7 @@ public class CollectionIdMapper: ICollectionIdMapper
 	{
 		private readonly HbmCollectionId hbmId;
 		private const string DefaultColumnName = "collection_key";
-		private string autosetType;
+		private string autosetType = "Int32";
 
 		public CollectionIdMapper(HbmCollectionId hbmId)
 		{
@@ -36,14 +36,15 @@ public void Generator(IGeneratorDef generator, Action<IGeneratorMapper> generato
 				throw new NotSupportedException("The generator '" + generator.Class + "' cannot be used as collection element id.");
 			}
 			ApplyGenerator(generator);
-			generatorMapping(new GeneratorMapper(hbmId.generator));
+			generatorMapping(new GeneratorMapper(hbmId.Generator));
 		}
 
 		public void Type(IIdentifierType persistentType)
 		{
 			if (persistentType != null)
 			{
-				hbmId.type = persistentType.Name;
+				hbmId.type1 = persistentType.Name;
+				hbmId.type = null;
 			}
 		}
 
@@ -87,10 +88,11 @@ private void ApplyGenerator(IGeneratorDef generator)
 
 		private void AutosetTypeThroughGeneratorDef(IGeneratorDef generator)
 		{
-			if (Equals(hbmId.type, autosetType) && generator.DefaultReturnType != null)
+			if (Equals(hbmId.type1, autosetType) && generator.DefaultReturnType != null)
 			{
 				autosetType = generator.DefaultReturnType.GetNhTypeName();
-				hbmId.type = autosetType;
+				hbmId.type1 = autosetType;
+				hbmId.type = null;
 			}
 		}
 	}
diff --git a/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs
index 4fc77568ac6..9e147ac26de 100644
--- a/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs
+++ b/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs
@@ -46,7 +46,7 @@ public void Generator(IGeneratorDef generator)
 		public void Generator(IGeneratorDef generator, Action<IGeneratorMapper> generatorMapping)
 		{
 			ApplyGenerator(generator);
-			generatorMapping(new GeneratorMapper(hbmId.generator));
+			generatorMapping(new GeneratorMapper(hbmId.Generator));
 		}
 
 		public void Access(Accessor accessor)
diff --git a/src/NHibernate/nhibernate-mapping.xsd b/src/NHibernate/nhibernate-mapping.xsd
index 60d36e5a128..c616345a5b5 100644
--- a/src/NHibernate/nhibernate-mapping.xsd
+++ b/src/NHibernate/nhibernate-mapping.xsd
@@ -216,11 +216,13 @@
 			<xs:sequence>
 				<xs:element ref="meta" minOccurs="0" maxOccurs="unbounded" />
 				<xs:element ref="column" minOccurs="0" maxOccurs="unbounded" />
-				<xs:element ref="generator" />
+				<xs:element ref="generator" minOccurs="0" />
+				<xs:element ref="type" minOccurs="0" />
 			</xs:sequence>
-			<xs:attribute name="column" use="required" type="xs:string" />
-			<xs:attribute name="type" use="required" type="xs:string" />
+			<xs:attribute name="column" type="xs:string" />
+			<xs:attribute name="type" default="Int32" type="xs:string" />
 			<xs:attribute name="length" type="xs:positiveInteger" />
+			<xs:attribute name="generator" type="xs:string" />
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="column">
@@ -228,15 +230,12 @@
 			<xs:sequence>
 				<xs:element ref="comment" minOccurs="0" />
 			</xs:sequence>
-			<xs:attribute name="name" use="required" type="xs:string">
-			</xs:attribute>
+			<xs:attribute name="name" use="required" type="xs:string" />
 			<xs:attribute name="length" type="xs:positiveInteger" />
 			<xs:attribute name="precision" type="xs:positiveInteger" />
 			<xs:attribute name="scale" type="xs:nonNegativeInteger" />
-			<xs:attribute name="not-null" type="xs:boolean">
-			</xs:attribute>
-			<xs:attribute name="unique" type="xs:boolean">
-			</xs:attribute>
+			<xs:attribute name="not-null" type="xs:boolean" />
+			<xs:attribute name="unique" type="xs:boolean" />
 			<xs:attribute name="unique-key" type="xs:string" />
 			<xs:attribute name="sql-type" type="xs:string" />
 			<xs:attribute name="index" type="xs:string" />