[156926]

[153744]

299 files changed, 12020 insertions, 1458 deletions

diff --git a/examples/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF
index e1555d3db..d2f2768a4 100644
--- a/examples/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF
@@ -188,6 +188,9 @@ Export-Package: extlibrary,
  org.eclipse.emf.teneo.samples.emf.sample.library.impl,
  org.eclipse.emf.teneo.samples.emf.sample.library.model,
  org.eclipse.emf.teneo.samples.emf.sample.library.util,
+ org.eclipse.emf.teneo.samples.emf.sample.mindmap,
+ org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl,
+ org.eclipse.emf.teneo.samples.emf.sample.mindmap.util,
  org.eclipse.emf.teneo.samples.emf.sample.play,
  org.eclipse.emf.teneo.samples.emf.sample.play.data,
  org.eclipse.emf.teneo.samples.emf.sample.play.impl,
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/extlibrary.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/extlibrary.Book.jdo
index 32e5bb030..45a2291d3 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/extlibrary.Book.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/extlibrary.Book.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:09 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:21 CET 2006 -->
 <jdo>
 	<package name="extlibrary.impl">
 		<class name="extlibrary.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.accounting.Account.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.accounting.Account.jdo
index 0d6e6b316..14498c03d 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.accounting.Account.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.accounting.Account.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:15 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:25 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="account" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.catalog.CatalogType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.catalog.CatalogType.jdo
index a9173bd09..7bd8499e9 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.catalog.CatalogType.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.catalog.CatalogType.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:23 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:30 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.CatalogTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="catalogtype" identity-type="application">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.epo2.Item.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.epo2.Item.jdo
index 49ec33727..cb7119fb2 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.epo2.Item.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.epo2.Item.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:14 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:24 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="item" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.forum.Forum.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.forum.Forum.jdo
index 1c784b448..fdb26065a 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.forum.Forum.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.forum.Forum.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:22 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:29 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.ForumImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="forum" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.inv.PType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.inv.PType.jdo
index 22032c97d..72f8eb269 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.inv.PType.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.inv.PType.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:10 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:22 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="ptype" identity-type="application">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.library.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.library.Book.jdo
index c49c61d27..cf514cacd 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.library.Book.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.library.Book.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:05 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:18 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot.jdo
new file mode 100644
index 000000000..9a25899bd
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot.jdo
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
+
+<!--	Generated by Teneo on Tue Nov 14 15:39:11 CET 2006 -->
+<jdo>
+	<package name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl">
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MapImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="map" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table">
+				<discriminator column="DTYPE" strategy="value-map" value="Map"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="rootTopics" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="MAP_ROOTTOPICS_IDX"/>
+				<column name="map_roottopics_id" allows-null="true"/>
+				<foreign-key delete-action="cascade" update-action="cascade"/>
+			</field>
+			<field name="relations" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.RelationshipImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="MAP_RELATIONS_IDX"/>
+				<column name="map_relations_id" allows-null="true"/>
+				<foreign-key delete-action="cascade" update-action="cascade"/>
+			</field>
+			<field name="resources" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="MAP_RESOURCES_IDX"/>
+				<column name="map_resources_id" allows-null="true"/>
+				<foreign-key delete-action="cascade" update-action="cascade"/>
+			</field>
+			<field name="title" persistence-modifier="persistent" null-value="none"/>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.RelationshipImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="relationship" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table">
+				<discriminator column="DTYPE" strategy="value-map" value="Relationship"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="label" persistence-modifier="persistent" null-value="none"/>
+			<field name="source" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+				<foreign-key>
+					<column name="topic_source_id" allows-null="true"/>
+				</foreign-key>
+				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl"/>
+			</field>
+			<field name="target" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+				<foreign-key>
+					<column name="topic_target_id" allows-null="true"/>
+				</foreign-key>
+				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl"/>
+			</field>
+			<field name="type" persistence-modifier="persistent" null-value="none" embedded="true"/>
+			<field name="typeESet" persistence-modifier="persistent"/>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="resource" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table">
+				<discriminator column="DTYPE" strategy="value-map" value="Resource"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="comments" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl" dependent-element="false">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="RESOURCE_COMMENTS_IDX"/>
+				<column name="thread_author_id" allows-null="true"/>
+				<foreign-key delete-action="restrict" update-action="cascade"/>
+			</field>
+			<field name="email" persistence-modifier="persistent" null-value="none"/>
+			<field name="name" persistence-modifier="persistent" null-value="none"/>
+			<field name="topics" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl" dependent-element="false">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<join/>
+			</field>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="thread" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table">
+				<discriminator column="DTYPE" strategy="value-map" value="Thread"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="items" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadItemImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="THREAD_ITEMS_IDX"/>
+				<column name="thread_items_id" allows-null="true"/>
+				<foreign-key delete-action="cascade" update-action="cascade"/>
+			</field>
+			<field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+				<foreign-key>
+					<column name="thread_author_id" allows-null="true"/>
+				</foreign-key>
+				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl"/>
+			</field>
+			<field name="postDate" persistence-modifier="persistent" null-value="none" serialized="true"/>
+			<field name="subject" persistence-modifier="persistent" null-value="none"/>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="threaditem" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table">
+				<discriminator column="DTYPE" strategy="value-map" value="ThreadItem"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+				<foreign-key>
+					<column name="resource_author_id" allows-null="true"/>
+				</foreign-key>
+				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl"/>
+			</field>
+			<field name="body" persistence-modifier="persistent" null-value="none"/>
+			<field name="itemPostDate" persistence-modifier="persistent" null-value="none" serialized="true"/>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="topic" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table">
+				<discriminator column="DTYPE" strategy="value-map" value="Topic"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="comments" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="TOPIC_COMMENTS_IDX"/>
+				<column name="topic_comments_id" allows-null="true"/>
+				<foreign-key delete-action="cascade" update-action="cascade"/>
+			</field>
+			<field name="duration" persistence-modifier="persistent" null-value="none"/>
+			<field name="durationESet" persistence-modifier="persistent"/>
+			<field name="endDate" persistence-modifier="persistent" null-value="none" serialized="true"/>
+			<field name="name" persistence-modifier="persistent" null-value="none"/>
+			<field name="percentComplete" persistence-modifier="persistent" null-value="none"/>
+			<field name="percentCompleteESet" persistence-modifier="persistent"/>
+			<field name="priority" persistence-modifier="persistent" null-value="none" embedded="true"/>
+			<field name="priorityESet" persistence-modifier="persistent"/>
+			<field name="resources" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl" dependent-element="false">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<join/>
+			</field>
+			<field name="startDate" persistence-modifier="persistent" null-value="none" serialized="true"/>
+			<field name="subtopics" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl" dependent-element="false">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="TOPIC_SUBTOPICS_IDX"/>
+				<column name="topic_subtopics_id" allows-null="true"/>
+				<foreign-key delete-action="restrict" update-action="cascade"/>
+			</field>
+		</class>
+	</package>
+</jdo>
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.play.ActType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.play.ActType.jdo
index cd5fc9c30..88574fadb 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.play.ActType.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.play.ActType.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:17 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:26 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.play.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.ActTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="acttype" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.product.ProductType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.product.ProductType.jdo
index 7d13e024d..12c1d8c9a 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.product.ProductType.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.product.ProductType.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:19 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:27 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.product.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="producttype" identity-type="application">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.DocumentRoot.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.DocumentRoot.jdo
index f849c9159..2ecea65b6 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.DocumentRoot.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.DocumentRoot.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:20 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:28 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="item" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.Book.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.Book.jdo
index d3cb77263..5d0121d92 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.Book.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.Book.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:12 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:23 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.sunBooks.AuthorsType.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.sunBooks.AuthorsType.jdo
index 763695ebd..06fe4e923 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.sunBooks.AuthorsType.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.sunBooks.AuthorsType.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:07 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:20 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.AuthorsTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="authorstype" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.workflow.Workflow.jdo b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.workflow.Workflow.jdo
index 0cd28c956..cc606ea92 100644
--- a/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.workflow.Workflow.jdo
+++ b/examples/org.eclipse.emf.teneo.samples/jdofiles/org.eclipse.emf.teneo.samples.emf.sample.workflow.Workflow.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:06 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:19 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore">
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/DocumentRoot.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/DocumentRoot.java
new file mode 100644
index 000000000..8ac86b950
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/DocumentRoot.java
@@ -0,0 +1,115 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DocumentRoot.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap;
+
+import org.eclipse.emf.common.util.EMap;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.emf.ecore.util.FeatureMap;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Document Root</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot#getMixed <em>Mixed</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot#getMap <em>Map</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getDocumentRoot()
+ * @model extendedMetaData="name='' kind='mixed'"
+ * @generated
+ */
+public interface DocumentRoot extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
+	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Mixed</em>' attribute list.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getDocumentRoot_Mixed()
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
+	 *        extendedMetaData="kind='elementWildcard' name=':mixed'"
+	 * @generated
+	 */
+	FeatureMap getMixed();
+
+	/**
+	 * Returns the value of the '<em><b>XMLNS Prefix Map</b></em>' map.
+	 * The key is of type {@link java.lang.String},
+	 * and the value is of type {@link java.lang.String},
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>XMLNS Prefix Map</em>' map isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>XMLNS Prefix Map</em>' map.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getDocumentRoot_XMLNSPrefixMap()
+	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
+	 *        extendedMetaData="kind='attribute' name='xmlns:prefix'"
+	 * @generated
+	 */
+	EMap getXMLNSPrefixMap();
+
+	/**
+	 * Returns the value of the '<em><b>XSI Schema Location</b></em>' map.
+	 * The key is of type {@link java.lang.String},
+	 * and the value is of type {@link java.lang.String},
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>XSI Schema Location</em>' map isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>XSI Schema Location</em>' map.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getDocumentRoot_XSISchemaLocation()
+	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
+	 *        extendedMetaData="kind='attribute' name='xsi:schemaLocation'"
+	 * @generated
+	 */
+	EMap getXSISchemaLocation();
+
+	/**
+	 * Returns the value of the '<em><b>Map</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Map</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Map</em>' containment reference.
+	 * @see #setMap(Map)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getDocumentRoot_Map()
+	 * @model containment="true" upper="-2" transient="true" volatile="true" derived="true"
+	 *        extendedMetaData="kind='element' name='map' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	Map getMap();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot#getMap <em>Map</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Map</em>' containment reference.
+	 * @see #getMap()
+	 * @generated
+	 */
+	void setMap(Map value);
+
+} // DocumentRoot
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Map.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Map.java
new file mode 100644
index 000000000..289dcf27c
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Map.java
@@ -0,0 +1,111 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Map.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Map</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map#getRootTopics <em>Root Topics</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map#getRelations <em>Relations</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map#getResources <em>Resources</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map#getTitle <em>Title</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getMap()
+ * @model extendedMetaData="name='Map' kind='elementOnly'"
+ * @generated
+ */
+public interface Map extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Root Topics</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Root Topics</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Root Topics</em>' containment reference list.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getMap_RootTopics()
+	 * @model type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic" containment="true"
+	 *        extendedMetaData="kind='element' name='rootTopics'"
+	 * @generated
+	 */
+	EList getRootTopics();
+
+	/**
+	 * Returns the value of the '<em><b>Relations</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Relations</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Relations</em>' containment reference list.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getMap_Relations()
+	 * @model type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship" containment="true"
+	 *        extendedMetaData="kind='element' name='relations'"
+	 * @generated
+	 */
+	EList getRelations();
+
+	/**
+	 * Returns the value of the '<em><b>Resources</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Resources</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Resources</em>' containment reference list.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getMap_Resources()
+	 * @model type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource" containment="true"
+	 *        extendedMetaData="kind='element' name='resources'"
+	 * @generated
+	 */
+	EList getResources();
+
+	/**
+	 * Returns the value of the '<em><b>Title</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Title</em>' attribute.
+	 * @see #setTitle(String)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getMap_Title()
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
+	 *        extendedMetaData="kind='attribute' name='title'"
+	 * @generated
+	 */
+	String getTitle();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map#getTitle <em>Title</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * @see #getTitle()
+	 * @generated
+	 */
+	void setTitle(String value);
+
+} // Map
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/MindmapFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/MindmapFactory.java
new file mode 100644
index 000000000..0897430bc
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/MindmapFactory.java
@@ -0,0 +1,100 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: MindmapFactory.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage
+ * @generated
+ */
+public interface MindmapFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	MindmapFactory eINSTANCE = org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Document Root</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Document Root</em>'.
+	 * @generated
+	 */
+	DocumentRoot createDocumentRoot();
+
+	/**
+	 * Returns a new object of class '<em>Map</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Map</em>'.
+	 * @generated
+	 */
+	Map createMap();
+
+	/**
+	 * Returns a new object of class '<em>Relationship</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Relationship</em>'.
+	 * @generated
+	 */
+	Relationship createRelationship();
+
+	/**
+	 * Returns a new object of class '<em>Resource</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Resource</em>'.
+	 * @generated
+	 */
+	Resource createResource();
+
+	/**
+	 * Returns a new object of class '<em>Thread</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Thread</em>'.
+	 * @generated
+	 */
+	org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread createThread();
+
+	/**
+	 * Returns a new object of class '<em>Thread Item</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Thread Item</em>'.
+	 * @generated
+	 */
+	ThreadItem createThreadItem();
+
+	/**
+	 * Returns a new object of class '<em>Topic</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Topic</em>'.
+	 * @generated
+	 */
+	Topic createTopic();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	MindmapPackage getMindmapPackage();
+
+} //MindmapFactory
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/MindmapPackage.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/MindmapPackage.java
new file mode 100644
index 000000000..fc4415f15
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/MindmapPackage.java
@@ -0,0 +1,1382 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: MindmapPackage.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface MindmapPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "mindmap";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "mindmap";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	MindmapPackage eINSTANCE = org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.DocumentRootImpl <em>Document Root</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.DocumentRootImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getDocumentRoot()
+	 * @generated
+	 */
+	int DOCUMENT_ROOT = 0;
+
+	/**
+	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOCUMENT_ROOT__MIXED = 0;
+
+	/**
+	 * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
+
+	/**
+	 * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
+
+	/**
+	 * The feature id for the '<em><b>Map</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOCUMENT_ROOT__MAP = 3;
+
+	/**
+	 * The number of structural features of the '<em>Document Root</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOCUMENT_ROOT_FEATURE_COUNT = 4;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MapImpl <em>Map</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MapImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getMap()
+	 * @generated
+	 */
+	int MAP = 1;
+
+	/**
+	 * The feature id for the '<em><b>Root Topics</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MAP__ROOT_TOPICS = 0;
+
+	/**
+	 * The feature id for the '<em><b>Relations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MAP__RELATIONS = 1;
+
+	/**
+	 * The feature id for the '<em><b>Resources</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MAP__RESOURCES = 2;
+
+	/**
+	 * The feature id for the '<em><b>Title</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MAP__TITLE = 3;
+
+	/**
+	 * The number of structural features of the '<em>Map</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MAP_FEATURE_COUNT = 4;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.RelationshipImpl <em>Relationship</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.RelationshipImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getRelationship()
+	 * @generated
+	 */
+	int RELATIONSHIP = 2;
+
+	/**
+	 * The feature id for the '<em><b>Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RELATIONSHIP__LABEL = 0;
+
+	/**
+	 * The feature id for the '<em><b>Source</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RELATIONSHIP__SOURCE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RELATIONSHIP__TARGET = 2;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RELATIONSHIP__TYPE = 3;
+
+	/**
+	 * The number of structural features of the '<em>Relationship</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RELATIONSHIP_FEATURE_COUNT = 4;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl <em>Resource</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getResource()
+	 * @generated
+	 */
+	int RESOURCE = 3;
+
+	/**
+	 * The feature id for the '<em><b>Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESOURCE__COMMENTS = 0;
+
+	/**
+	 * The feature id for the '<em><b>Email</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESOURCE__EMAIL = 1;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESOURCE__NAME = 2;
+
+	/**
+	 * The feature id for the '<em><b>Topics</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESOURCE__TOPICS = 3;
+
+	/**
+	 * The number of structural features of the '<em>Resource</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESOURCE_FEATURE_COUNT = 4;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl <em>Thread</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getThread()
+	 * @generated
+	 */
+	int THREAD = 4;
+
+	/**
+	 * The feature id for the '<em><b>Items</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int THREAD__ITEMS = 0;
+
+	/**
+	 * The feature id for the '<em><b>Author</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int THREAD__AUTHOR = 1;
+
+	/**
+	 * The feature id for the '<em><b>Post Date</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int THREAD__POST_DATE = 2;
+
+	/**
+	 * The feature id for the '<em><b>Subject</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int THREAD__SUBJECT = 3;
+
+	/**
+	 * The number of structural features of the '<em>Thread</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int THREAD_FEATURE_COUNT = 4;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadItemImpl <em>Thread Item</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadItemImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getThreadItem()
+	 * @generated
+	 */
+	int THREAD_ITEM = 5;
+
+	/**
+	 * The feature id for the '<em><b>Author</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int THREAD_ITEM__AUTHOR = 0;
+
+	/**
+	 * The feature id for the '<em><b>Body</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int THREAD_ITEM__BODY = 1;
+
+	/**
+	 * The feature id for the '<em><b>Item Post Date</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int THREAD_ITEM__ITEM_POST_DATE = 2;
+
+	/**
+	 * The number of structural features of the '<em>Thread Item</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int THREAD_ITEM_FEATURE_COUNT = 3;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl <em>Topic</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getTopic()
+	 * @generated
+	 */
+	int TOPIC = 6;
+
+	/**
+	 * The feature id for the '<em><b>Comments</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TOPIC__COMMENTS = 0;
+
+	/**
+	 * The feature id for the '<em><b>Duration</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TOPIC__DURATION = 1;
+
+	/**
+	 * The feature id for the '<em><b>End Date</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TOPIC__END_DATE = 2;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TOPIC__NAME = 3;
+
+	/**
+	 * The feature id for the '<em><b>Percent Complete</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TOPIC__PERCENT_COMPLETE = 4;
+
+	/**
+	 * The feature id for the '<em><b>Priority</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TOPIC__PRIORITY = 5;
+
+	/**
+	 * The feature id for the '<em><b>Resources</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TOPIC__RESOURCES = 6;
+
+	/**
+	 * The feature id for the '<em><b>Start Date</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TOPIC__START_DATE = 7;
+
+	/**
+	 * The feature id for the '<em><b>Subtopics</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TOPIC__SUBTOPICS = 8;
+
+	/**
+	 * The number of structural features of the '<em>Topic</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TOPIC_FEATURE_COUNT = 9;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority <em>Priority</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getPriority()
+	 * @generated
+	 */
+	int PRIORITY = 7;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType <em>Relationship Type</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getRelationshipType()
+	 * @generated
+	 */
+	int RELATIONSHIP_TYPE = 8;
+
+	/**
+	 * The meta object id for the '<em>Priority Object</em>' data type.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getPriorityObject()
+	 * @generated
+	 */
+	int PRIORITY_OBJECT = 9;
+
+	/**
+	 * The meta object id for the '<em>Relationship Type Object</em>' data type.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getRelationshipTypeObject()
+	 * @generated
+	 */
+	int RELATIONSHIP_TYPE_OBJECT = 10;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot <em>Document Root</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Document Root</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot
+	 * @generated
+	 */
+	EClass getDocumentRoot();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot#getMixed <em>Mixed</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Mixed</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot#getMixed()
+	 * @see #getDocumentRoot()
+	 * @generated
+	 */
+	EAttribute getDocumentRoot_Mixed();
+
+	/**
+	 * Returns the meta object for the map '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot#getXMLNSPrefixMap()
+	 * @see #getDocumentRoot()
+	 * @generated
+	 */
+	EReference getDocumentRoot_XMLNSPrefixMap();
+
+	/**
+	 * Returns the meta object for the map '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the map '<em>XSI Schema Location</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot#getXSISchemaLocation()
+	 * @see #getDocumentRoot()
+	 * @generated
+	 */
+	EReference getDocumentRoot_XSISchemaLocation();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot#getMap <em>Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Map</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot#getMap()
+	 * @see #getDocumentRoot()
+	 * @generated
+	 */
+	EReference getDocumentRoot_Map();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map <em>Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Map</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map
+	 * @generated
+	 */
+	EClass getMap();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map#getRootTopics <em>Root Topics</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Root Topics</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map#getRootTopics()
+	 * @see #getMap()
+	 * @generated
+	 */
+	EReference getMap_RootTopics();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map#getRelations <em>Relations</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Relations</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map#getRelations()
+	 * @see #getMap()
+	 * @generated
+	 */
+	EReference getMap_Relations();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map#getResources <em>Resources</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Resources</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map#getResources()
+	 * @see #getMap()
+	 * @generated
+	 */
+	EReference getMap_Resources();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map#getTitle <em>Title</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Title</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map#getTitle()
+	 * @see #getMap()
+	 * @generated
+	 */
+	EAttribute getMap_Title();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship <em>Relationship</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Relationship</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship
+	 * @generated
+	 */
+	EClass getRelationship();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getLabel <em>Label</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Label</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getLabel()
+	 * @see #getRelationship()
+	 * @generated
+	 */
+	EAttribute getRelationship_Label();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getSource <em>Source</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Source</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getSource()
+	 * @see #getRelationship()
+	 * @generated
+	 */
+	EReference getRelationship_Source();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getTarget <em>Target</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Target</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getTarget()
+	 * @see #getRelationship()
+	 * @generated
+	 */
+	EReference getRelationship_Target();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getType <em>Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Type</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getType()
+	 * @see #getRelationship()
+	 * @generated
+	 */
+	EAttribute getRelationship_Type();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource <em>Resource</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Resource</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource
+	 * @generated
+	 */
+	EClass getResource();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getComments <em>Comments</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Comments</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getComments()
+	 * @see #getResource()
+	 * @generated
+	 */
+	EReference getResource_Comments();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getEmail <em>Email</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Email</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getEmail()
+	 * @see #getResource()
+	 * @generated
+	 */
+	EAttribute getResource_Email();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getName()
+	 * @see #getResource()
+	 * @generated
+	 */
+	EAttribute getResource_Name();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getTopics <em>Topics</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Topics</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getTopics()
+	 * @see #getResource()
+	 * @generated
+	 */
+	EReference getResource_Topics();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread <em>Thread</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Thread</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread
+	 * @generated
+	 */
+	EClass getThread();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getItems <em>Items</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Items</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getItems()
+	 * @see #getThread()
+	 * @generated
+	 */
+	EReference getThread_Items();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getAuthor <em>Author</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Author</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getAuthor()
+	 * @see #getThread()
+	 * @generated
+	 */
+	EReference getThread_Author();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getPostDate <em>Post Date</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Post Date</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getPostDate()
+	 * @see #getThread()
+	 * @generated
+	 */
+	EAttribute getThread_PostDate();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getSubject <em>Subject</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Subject</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getSubject()
+	 * @see #getThread()
+	 * @generated
+	 */
+	EAttribute getThread_Subject();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem <em>Thread Item</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Thread Item</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem
+	 * @generated
+	 */
+	EClass getThreadItem();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem#getAuthor <em>Author</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Author</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem#getAuthor()
+	 * @see #getThreadItem()
+	 * @generated
+	 */
+	EReference getThreadItem_Author();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem#getBody <em>Body</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Body</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem#getBody()
+	 * @see #getThreadItem()
+	 * @generated
+	 */
+	EAttribute getThreadItem_Body();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem#getItemPostDate <em>Item Post Date</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Item Post Date</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem#getItemPostDate()
+	 * @see #getThreadItem()
+	 * @generated
+	 */
+	EAttribute getThreadItem_ItemPostDate();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic <em>Topic</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Topic</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic
+	 * @generated
+	 */
+	EClass getTopic();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getComments <em>Comments</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Comments</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getComments()
+	 * @see #getTopic()
+	 * @generated
+	 */
+	EReference getTopic_Comments();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getDuration <em>Duration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Duration</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getDuration()
+	 * @see #getTopic()
+	 * @generated
+	 */
+	EAttribute getTopic_Duration();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getEndDate <em>End Date</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>End Date</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getEndDate()
+	 * @see #getTopic()
+	 * @generated
+	 */
+	EAttribute getTopic_EndDate();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getName()
+	 * @see #getTopic()
+	 * @generated
+	 */
+	EAttribute getTopic_Name();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getPercentComplete <em>Percent Complete</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Percent Complete</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getPercentComplete()
+	 * @see #getTopic()
+	 * @generated
+	 */
+	EAttribute getTopic_PercentComplete();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getPriority <em>Priority</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Priority</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getPriority()
+	 * @see #getTopic()
+	 * @generated
+	 */
+	EAttribute getTopic_Priority();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getResources <em>Resources</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Resources</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getResources()
+	 * @see #getTopic()
+	 * @generated
+	 */
+	EReference getTopic_Resources();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getStartDate <em>Start Date</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Start Date</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getStartDate()
+	 * @see #getTopic()
+	 * @generated
+	 */
+	EAttribute getTopic_StartDate();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getSubtopics <em>Subtopics</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Subtopics</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getSubtopics()
+	 * @see #getTopic()
+	 * @generated
+	 */
+	EReference getTopic_Subtopics();
+
+	/**
+	 * Returns the meta object for enum '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority <em>Priority</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Priority</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority
+	 * @generated
+	 */
+	EEnum getPriority();
+
+	/**
+	 * Returns the meta object for enum '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType <em>Relationship Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Relationship Type</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType
+	 * @generated
+	 */
+	EEnum getRelationshipType();
+
+	/**
+	 * Returns the meta object for data type '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority <em>Priority Object</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for data type '<em>Priority Object</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority
+	 * @model instanceClass="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority"
+	 *        extendedMetaData="name='Priority:Object' baseType='Priority'" 
+	 * @generated
+	 */
+	EDataType getPriorityObject();
+
+	/**
+	 * Returns the meta object for data type '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType <em>Relationship Type Object</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for data type '<em>Relationship Type Object</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType
+	 * @model instanceClass="org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType"
+	 *        extendedMetaData="name='RelationshipType:Object' baseType='RelationshipType'" 
+	 * @generated
+	 */
+	EDataType getRelationshipTypeObject();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	MindmapFactory getMindmapFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.DocumentRootImpl <em>Document Root</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.DocumentRootImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getDocumentRoot()
+		 * @generated
+		 */
+		EClass DOCUMENT_ROOT = eINSTANCE.getDocumentRoot();
+
+		/**
+		 * The meta object literal for the '<em><b>Mixed</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DOCUMENT_ROOT__MIXED = eINSTANCE.getDocumentRoot_Mixed();
+
+		/**
+		 * The meta object literal for the '<em><b>XMLNS Prefix Map</b></em>' map feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DOCUMENT_ROOT__XMLNS_PREFIX_MAP = eINSTANCE.getDocumentRoot_XMLNSPrefixMap();
+
+		/**
+		 * The meta object literal for the '<em><b>XSI Schema Location</b></em>' map feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = eINSTANCE.getDocumentRoot_XSISchemaLocation();
+
+		/**
+		 * The meta object literal for the '<em><b>Map</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DOCUMENT_ROOT__MAP = eINSTANCE.getDocumentRoot_Map();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MapImpl <em>Map</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MapImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getMap()
+		 * @generated
+		 */
+		EClass MAP = eINSTANCE.getMap();
+
+		/**
+		 * The meta object literal for the '<em><b>Root Topics</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MAP__ROOT_TOPICS = eINSTANCE.getMap_RootTopics();
+
+		/**
+		 * The meta object literal for the '<em><b>Relations</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MAP__RELATIONS = eINSTANCE.getMap_Relations();
+
+		/**
+		 * The meta object literal for the '<em><b>Resources</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MAP__RESOURCES = eINSTANCE.getMap_Resources();
+
+		/**
+		 * The meta object literal for the '<em><b>Title</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute MAP__TITLE = eINSTANCE.getMap_Title();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.RelationshipImpl <em>Relationship</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.RelationshipImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getRelationship()
+		 * @generated
+		 */
+		EClass RELATIONSHIP = eINSTANCE.getRelationship();
+
+		/**
+		 * The meta object literal for the '<em><b>Label</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute RELATIONSHIP__LABEL = eINSTANCE.getRelationship_Label();
+
+		/**
+		 * The meta object literal for the '<em><b>Source</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference RELATIONSHIP__SOURCE = eINSTANCE.getRelationship_Source();
+
+		/**
+		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference RELATIONSHIP__TARGET = eINSTANCE.getRelationship_Target();
+
+		/**
+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute RELATIONSHIP__TYPE = eINSTANCE.getRelationship_Type();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl <em>Resource</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getResource()
+		 * @generated
+		 */
+		EClass RESOURCE = eINSTANCE.getResource();
+
+		/**
+		 * The meta object literal for the '<em><b>Comments</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference RESOURCE__COMMENTS = eINSTANCE.getResource_Comments();
+
+		/**
+		 * The meta object literal for the '<em><b>Email</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute RESOURCE__EMAIL = eINSTANCE.getResource_Email();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute RESOURCE__NAME = eINSTANCE.getResource_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Topics</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference RESOURCE__TOPICS = eINSTANCE.getResource_Topics();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl <em>Thread</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getThread()
+		 * @generated
+		 */
+		EClass THREAD = eINSTANCE.getThread();
+
+		/**
+		 * The meta object literal for the '<em><b>Items</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference THREAD__ITEMS = eINSTANCE.getThread_Items();
+
+		/**
+		 * The meta object literal for the '<em><b>Author</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference THREAD__AUTHOR = eINSTANCE.getThread_Author();
+
+		/**
+		 * The meta object literal for the '<em><b>Post Date</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute THREAD__POST_DATE = eINSTANCE.getThread_PostDate();
+
+		/**
+		 * The meta object literal for the '<em><b>Subject</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute THREAD__SUBJECT = eINSTANCE.getThread_Subject();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadItemImpl <em>Thread Item</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadItemImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getThreadItem()
+		 * @generated
+		 */
+		EClass THREAD_ITEM = eINSTANCE.getThreadItem();
+
+		/**
+		 * The meta object literal for the '<em><b>Author</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference THREAD_ITEM__AUTHOR = eINSTANCE.getThreadItem_Author();
+
+		/**
+		 * The meta object literal for the '<em><b>Body</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute THREAD_ITEM__BODY = eINSTANCE.getThreadItem_Body();
+
+		/**
+		 * The meta object literal for the '<em><b>Item Post Date</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute THREAD_ITEM__ITEM_POST_DATE = eINSTANCE.getThreadItem_ItemPostDate();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl <em>Topic</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getTopic()
+		 * @generated
+		 */
+		EClass TOPIC = eINSTANCE.getTopic();
+
+		/**
+		 * The meta object literal for the '<em><b>Comments</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TOPIC__COMMENTS = eINSTANCE.getTopic_Comments();
+
+		/**
+		 * The meta object literal for the '<em><b>Duration</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TOPIC__DURATION = eINSTANCE.getTopic_Duration();
+
+		/**
+		 * The meta object literal for the '<em><b>End Date</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TOPIC__END_DATE = eINSTANCE.getTopic_EndDate();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TOPIC__NAME = eINSTANCE.getTopic_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Percent Complete</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TOPIC__PERCENT_COMPLETE = eINSTANCE.getTopic_PercentComplete();
+
+		/**
+		 * The meta object literal for the '<em><b>Priority</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TOPIC__PRIORITY = eINSTANCE.getTopic_Priority();
+
+		/**
+		 * The meta object literal for the '<em><b>Resources</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TOPIC__RESOURCES = eINSTANCE.getTopic_Resources();
+
+		/**
+		 * The meta object literal for the '<em><b>Start Date</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TOPIC__START_DATE = eINSTANCE.getTopic_StartDate();
+
+		/**
+		 * The meta object literal for the '<em><b>Subtopics</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TOPIC__SUBTOPICS = eINSTANCE.getTopic_Subtopics();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority <em>Priority</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getPriority()
+		 * @generated
+		 */
+		EEnum PRIORITY = eINSTANCE.getPriority();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType <em>Relationship Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getRelationshipType()
+		 * @generated
+		 */
+		EEnum RELATIONSHIP_TYPE = eINSTANCE.getRelationshipType();
+
+		/**
+		 * The meta object literal for the '<em>Priority Object</em>' data type.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getPriorityObject()
+		 * @generated
+		 */
+		EDataType PRIORITY_OBJECT = eINSTANCE.getPriorityObject();
+
+		/**
+		 * The meta object literal for the '<em>Relationship Type Object</em>' data type.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MindmapPackageImpl#getRelationshipTypeObject()
+		 * @generated
+		 */
+		EDataType RELATIONSHIP_TYPE_OBJECT = eINSTANCE.getRelationshipTypeObject();
+
+	}
+
+} //MindmapPackage
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Priority.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Priority.java
new file mode 100644
index 000000000..f8e142dbb
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Priority.java
@@ -0,0 +1,259 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Priority.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.AbstractEnumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Priority</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getPriority()
+ * @model
+ * @generated
+ */
+public final class Priority extends AbstractEnumerator {
+	/**
+	 * The '<em><b>ZERO</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>ZERO</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #ZERO_LITERAL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ZERO = 0;
+
+	/**
+	 * The '<em><b>ONE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>ONE</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #ONE_LITERAL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ONE = 1;
+
+	/**
+	 * The '<em><b>TWO</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>TWO</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #TWO_LITERAL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int TWO = 2;
+
+	/**
+	 * The '<em><b>THREE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>THREE</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #THREE_LITERAL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int THREE = 3;
+
+	/**
+	 * The '<em><b>FOUR</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>FOUR</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #FOUR_LITERAL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int FOUR = 4;
+
+	/**
+	 * The '<em><b>FIVE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>FIVE</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #FIVE_LITERAL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int FIVE = 5;
+
+	/**
+	 * The '<em><b>ZERO</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ZERO
+	 * @generated
+	 * @ordered
+	 */
+	public static final Priority ZERO_LITERAL = new Priority(ZERO, "ZERO", "ZERO");
+
+	/**
+	 * The '<em><b>ONE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ONE
+	 * @generated
+	 * @ordered
+	 */
+	public static final Priority ONE_LITERAL = new Priority(ONE, "ONE", "ONE");
+
+	/**
+	 * The '<em><b>TWO</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #TWO
+	 * @generated
+	 * @ordered
+	 */
+	public static final Priority TWO_LITERAL = new Priority(TWO, "TWO", "TWO");
+
+	/**
+	 * The '<em><b>THREE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #THREE
+	 * @generated
+	 * @ordered
+	 */
+	public static final Priority THREE_LITERAL = new Priority(THREE, "THREE", "THREE");
+
+	/**
+	 * The '<em><b>FOUR</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #FOUR
+	 * @generated
+	 * @ordered
+	 */
+	public static final Priority FOUR_LITERAL = new Priority(FOUR, "FOUR", "FOUR");
+
+	/**
+	 * The '<em><b>FIVE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #FIVE
+	 * @generated
+	 * @ordered
+	 */
+	public static final Priority FIVE_LITERAL = new Priority(FIVE, "FIVE", "FIVE");
+
+	/**
+	 * An array of all the '<em><b>Priority</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final Priority[] VALUES_ARRAY =
+		new Priority[] {
+			ZERO_LITERAL,
+			ONE_LITERAL,
+			TWO_LITERAL,
+			THREE_LITERAL,
+			FOUR_LITERAL,
+			FIVE_LITERAL,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Priority</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Priority</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static Priority get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Priority result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Priority</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static Priority getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Priority result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Priority</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static Priority get(int value) {
+		switch (value) {
+			case ZERO: return ZERO_LITERAL;
+			case ONE: return ONE_LITERAL;
+			case TWO: return TWO_LITERAL;
+			case THREE: return THREE_LITERAL;
+			case FOUR: return FOUR_LITERAL;
+			case FIVE: return FIVE_LITERAL;
+		}
+		return null;	
+	}
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private Priority(int value, String name, String literal) {
+		super(value, name, literal);
+	}
+
+} //Priority
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Relationship.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Relationship.java
new file mode 100644
index 000000000..a118adf3e
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Relationship.java
@@ -0,0 +1,168 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Relationship.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Relationship</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getSource <em>Source</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getType <em>Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getRelationship()
+ * @model extendedMetaData="name='Relationship' kind='empty'"
+ * @generated
+ */
+public interface Relationship extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Label</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Label</em>' attribute.
+	 * @see #setLabel(String)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getRelationship_Label()
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
+	 *        extendedMetaData="kind='attribute' name='label'"
+	 * @generated
+	 */
+	String getLabel();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getLabel <em>Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Label</em>' attribute.
+	 * @see #getLabel()
+	 * @generated
+	 */
+	void setLabel(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Source</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Source</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Source</em>' reference.
+	 * @see #setSource(Topic)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getRelationship_Source()
+	 * @model extendedMetaData="kind='attribute' name='source'"
+	 * @generated
+	 */
+	Topic getSource();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getSource <em>Source</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Source</em>' reference.
+	 * @see #getSource()
+	 * @generated
+	 */
+	void setSource(Topic value);
+
+	/**
+	 * Returns the value of the '<em><b>Target</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Target</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Target</em>' reference.
+	 * @see #setTarget(Topic)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getRelationship_Target()
+	 * @model extendedMetaData="kind='attribute' name='target'"
+	 * @generated
+	 */
+	Topic getTarget();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getTarget <em>Target</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Target</em>' reference.
+	 * @see #getTarget()
+	 * @generated
+	 */
+	void setTarget(Topic value);
+
+	/**
+	 * Returns the value of the '<em><b>Type</b></em>' attribute.
+	 * The default value is <code>"DEPENDENCY"</code>.
+	 * The literals are from the enumeration {@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Type</em>' attribute.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType
+	 * @see #isSetType()
+	 * @see #unsetType()
+	 * @see #setType(RelationshipType)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getRelationship_Type()
+	 * @model default="DEPENDENCY" unique="false" unsettable="true"
+	 *        extendedMetaData="kind='attribute' name='type'"
+	 * @generated
+	 */
+	RelationshipType getType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getType <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Type</em>' attribute.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType
+	 * @see #isSetType()
+	 * @see #unsetType()
+	 * @see #getType()
+	 * @generated
+	 */
+	void setType(RelationshipType value);
+
+	/**
+	 * Unsets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getType <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetType()
+	 * @see #getType()
+	 * @see #setType(RelationshipType)
+	 * @generated
+	 */
+	void unsetType();
+
+	/**
+	 * Returns whether the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship#getType <em>Type</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Type</em>' attribute is set.
+	 * @see #unsetType()
+	 * @see #getType()
+	 * @see #setType(RelationshipType)
+	 * @generated
+	 */
+	boolean isSetType();
+
+} // Relationship
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/RelationshipType.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/RelationshipType.java
new file mode 100644
index 000000000..dd7684ebc
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/RelationshipType.java
@@ -0,0 +1,178 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: RelationshipType.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.AbstractEnumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Relationship Type</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getRelationshipType()
+ * @model
+ * @generated
+ */
+public final class RelationshipType extends AbstractEnumerator {
+	/**
+	 * The '<em><b>DEPENDENCY</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>DEPENDENCY</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #DEPENDENCY_LITERAL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int DEPENDENCY = 0;
+
+	/**
+	 * The '<em><b>INCLUDES</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>INCLUDES</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #INCLUDES_LITERAL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int INCLUDES = 1;
+
+	/**
+	 * The '<em><b>EXTENDS</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>EXTENDS</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #EXTENDS_LITERAL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int EXTENDS = 2;
+
+	/**
+	 * The '<em><b>DEPENDENCY</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DEPENDENCY
+	 * @generated
+	 * @ordered
+	 */
+	public static final RelationshipType DEPENDENCY_LITERAL = new RelationshipType(DEPENDENCY, "DEPENDENCY", "DEPENDENCY");
+
+	/**
+	 * The '<em><b>INCLUDES</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #INCLUDES
+	 * @generated
+	 * @ordered
+	 */
+	public static final RelationshipType INCLUDES_LITERAL = new RelationshipType(INCLUDES, "INCLUDES", "INCLUDES");
+
+	/**
+	 * The '<em><b>EXTENDS</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #EXTENDS
+	 * @generated
+	 * @ordered
+	 */
+	public static final RelationshipType EXTENDS_LITERAL = new RelationshipType(EXTENDS, "EXTENDS", "EXTENDS");
+
+	/**
+	 * An array of all the '<em><b>Relationship Type</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final RelationshipType[] VALUES_ARRAY =
+		new RelationshipType[] {
+			DEPENDENCY_LITERAL,
+			INCLUDES_LITERAL,
+			EXTENDS_LITERAL,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Relationship Type</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Relationship Type</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static RelationshipType get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			RelationshipType result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Relationship Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static RelationshipType getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			RelationshipType result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Relationship Type</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static RelationshipType get(int value) {
+		switch (value) {
+			case DEPENDENCY: return DEPENDENCY_LITERAL;
+			case INCLUDES: return INCLUDES_LITERAL;
+			case EXTENDS: return EXTENDS_LITERAL;
+		}
+		return null;	
+	}
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private RelationshipType(int value, String name, String literal) {
+		super(value, name, literal);
+	}
+
+} //RelationshipType
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Resource.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Resource.java
new file mode 100644
index 000000000..3de19b4ae
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Resource.java
@@ -0,0 +1,125 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Resource.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Resource</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getComments <em>Comments</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getEmail <em>Email</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getTopics <em>Topics</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getResource()
+ * @model extendedMetaData="name='Resource' kind='empty'"
+ * @generated
+ */
+public interface Resource extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Comments</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getAuthor <em>Author</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Comments</em>' reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Comments</em>' reference list.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getResource_Comments()
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getAuthor
+	 * @model type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread" opposite="author"
+	 *        extendedMetaData="kind='attribute' name='comments'"
+	 * @generated
+	 */
+	EList getComments();
+
+	/**
+	 * Returns the value of the '<em><b>Email</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Email</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Email</em>' attribute.
+	 * @see #setEmail(String)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getResource_Email()
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
+	 *        extendedMetaData="kind='attribute' name='email'"
+	 * @generated
+	 */
+	String getEmail();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getEmail <em>Email</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Email</em>' attribute.
+	 * @see #getEmail()
+	 * @generated
+	 */
+	void setEmail(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getResource_Name()
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
+	 *        extendedMetaData="kind='attribute' name='name'"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Topics</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getResources <em>Resources</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Topics</em>' reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Topics</em>' reference list.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getResource_Topics()
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getResources
+	 * @model type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic" opposite="resources"
+	 *        extendedMetaData="kind='attribute' name='topics'"
+	 * @generated
+	 */
+	EList getTopics();
+
+} // Resource
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Thread.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Thread.java
new file mode 100644
index 000000000..43611ce7e
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Thread.java
@@ -0,0 +1,133 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Thread.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Thread</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getItems <em>Items</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getAuthor <em>Author</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getPostDate <em>Post Date</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getSubject <em>Subject</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getThread()
+ * @model extendedMetaData="name='Thread' kind='elementOnly'"
+ * @generated
+ */
+public interface Thread extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Items</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Items</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Items</em>' containment reference list.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getThread_Items()
+	 * @model type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem" containment="true"
+	 *        extendedMetaData="kind='element' name='items'"
+	 * @generated
+	 */
+	EList getItems();
+
+	/**
+	 * Returns the value of the '<em><b>Author</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getComments <em>Comments</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Author</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Author</em>' reference.
+	 * @see #setAuthor(Resource)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getThread_Author()
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getComments
+	 * @model opposite="comments"
+	 *        extendedMetaData="kind='attribute' name='author'"
+	 * @generated
+	 */
+	Resource getAuthor();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getAuthor <em>Author</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Author</em>' reference.
+	 * @see #getAuthor()
+	 * @generated
+	 */
+	void setAuthor(Resource value);
+
+	/**
+	 * Returns the value of the '<em><b>Post Date</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Post Date</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Post Date</em>' attribute.
+	 * @see #setPostDate(Object)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getThread_PostDate()
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Date"
+	 *        extendedMetaData="kind='attribute' name='postDate'"
+	 * @generated
+	 */
+	Object getPostDate();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getPostDate <em>Post Date</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Post Date</em>' attribute.
+	 * @see #getPostDate()
+	 * @generated
+	 */
+	void setPostDate(Object value);
+
+	/**
+	 * Returns the value of the '<em><b>Subject</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Subject</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Subject</em>' attribute.
+	 * @see #setSubject(String)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getThread_Subject()
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
+	 *        extendedMetaData="kind='attribute' name='subject'"
+	 * @generated
+	 */
+	String getSubject();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread#getSubject <em>Subject</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Subject</em>' attribute.
+	 * @see #getSubject()
+	 * @generated
+	 */
+	void setSubject(String value);
+
+} // Thread
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/ThreadItem.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/ThreadItem.java
new file mode 100644
index 000000000..ebb177237
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/ThreadItem.java
@@ -0,0 +1,110 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ThreadItem.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Thread Item</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem#getAuthor <em>Author</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem#getBody <em>Body</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem#getItemPostDate <em>Item Post Date</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getThreadItem()
+ * @model extendedMetaData="name='ThreadItem' kind='empty'"
+ * @generated
+ */
+public interface ThreadItem extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Author</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Author</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Author</em>' reference.
+	 * @see #setAuthor(Resource)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getThreadItem_Author()
+	 * @model extendedMetaData="kind='attribute' name='author'"
+	 * @generated
+	 */
+	Resource getAuthor();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem#getAuthor <em>Author</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Author</em>' reference.
+	 * @see #getAuthor()
+	 * @generated
+	 */
+	void setAuthor(Resource value);
+
+	/**
+	 * Returns the value of the '<em><b>Body</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Body</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Body</em>' attribute.
+	 * @see #setBody(String)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getThreadItem_Body()
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
+	 *        extendedMetaData="kind='attribute' name='body'"
+	 * @generated
+	 */
+	String getBody();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem#getBody <em>Body</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Body</em>' attribute.
+	 * @see #getBody()
+	 * @generated
+	 */
+	void setBody(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Item Post Date</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Item Post Date</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Item Post Date</em>' attribute.
+	 * @see #setItemPostDate(Object)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getThreadItem_ItemPostDate()
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Date"
+	 *        extendedMetaData="kind='attribute' name='itemPostDate'"
+	 * @generated
+	 */
+	Object getItemPostDate();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem#getItemPostDate <em>Item Post Date</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Item Post Date</em>' attribute.
+	 * @see #getItemPostDate()
+	 * @generated
+	 */
+	void setItemPostDate(Object value);
+
+} // ThreadItem
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Topic.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Topic.java
new file mode 100644
index 000000000..0f0e69b9c
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/Topic.java
@@ -0,0 +1,339 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Topic.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Topic</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getComments <em>Comments</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getDuration <em>Duration</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getEndDate <em>End Date</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getPercentComplete <em>Percent Complete</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getPriority <em>Priority</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getResources <em>Resources</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getStartDate <em>Start Date</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getSubtopics <em>Subtopics</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getTopic()
+ * @model extendedMetaData="name='Topic' kind='elementOnly'"
+ * @generated
+ */
+public interface Topic extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Comments</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Comments</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Comments</em>' containment reference list.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getTopic_Comments()
+	 * @model type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread" containment="true"
+	 *        extendedMetaData="kind='element' name='comments'"
+	 * @generated
+	 */
+	EList getComments();
+
+	/**
+	 * Returns the value of the '<em><b>Duration</b></em>' attribute.
+	 * The default value is <code>"0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Duration</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Duration</em>' attribute.
+	 * @see #isSetDuration()
+	 * @see #unsetDuration()
+	 * @see #setDuration(float)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getTopic_Duration()
+	 * @model default="0" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
+	 *        extendedMetaData="kind='attribute' name='duration'"
+	 * @generated
+	 */
+	float getDuration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getDuration <em>Duration</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Duration</em>' attribute.
+	 * @see #isSetDuration()
+	 * @see #unsetDuration()
+	 * @see #getDuration()
+	 * @generated
+	 */
+	void setDuration(float value);
+
+	/**
+	 * Unsets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getDuration <em>Duration</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetDuration()
+	 * @see #getDuration()
+	 * @see #setDuration(float)
+	 * @generated
+	 */
+	void unsetDuration();
+
+	/**
+	 * Returns whether the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getDuration <em>Duration</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Duration</em>' attribute is set.
+	 * @see #unsetDuration()
+	 * @see #getDuration()
+	 * @see #setDuration(float)
+	 * @generated
+	 */
+	boolean isSetDuration();
+
+	/**
+	 * Returns the value of the '<em><b>End Date</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>End Date</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>End Date</em>' attribute.
+	 * @see #setEndDate(Object)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getTopic_EndDate()
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Date"
+	 *        extendedMetaData="kind='attribute' name='endDate'"
+	 * @generated
+	 */
+	Object getEndDate();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getEndDate <em>End Date</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>End Date</em>' attribute.
+	 * @see #getEndDate()
+	 * @generated
+	 */
+	void setEndDate(Object value);
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getTopic_Name()
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
+	 *        extendedMetaData="kind='attribute' name='name'"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Percent Complete</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Percent Complete</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Percent Complete</em>' attribute.
+	 * @see #isSetPercentComplete()
+	 * @see #unsetPercentComplete()
+	 * @see #setPercentComplete(float)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getTopic_PercentComplete()
+	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
+	 *        extendedMetaData="kind='attribute' name='percentComplete'"
+	 * @generated
+	 */
+	float getPercentComplete();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getPercentComplete <em>Percent Complete</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Percent Complete</em>' attribute.
+	 * @see #isSetPercentComplete()
+	 * @see #unsetPercentComplete()
+	 * @see #getPercentComplete()
+	 * @generated
+	 */
+	void setPercentComplete(float value);
+
+	/**
+	 * Unsets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getPercentComplete <em>Percent Complete</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetPercentComplete()
+	 * @see #getPercentComplete()
+	 * @see #setPercentComplete(float)
+	 * @generated
+	 */
+	void unsetPercentComplete();
+
+	/**
+	 * Returns whether the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getPercentComplete <em>Percent Complete</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Percent Complete</em>' attribute is set.
+	 * @see #unsetPercentComplete()
+	 * @see #getPercentComplete()
+	 * @see #setPercentComplete(float)
+	 * @generated
+	 */
+	boolean isSetPercentComplete();
+
+	/**
+	 * Returns the value of the '<em><b>Priority</b></em>' attribute.
+	 * The default value is <code>"ZERO"</code>.
+	 * The literals are from the enumeration {@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Priority</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Priority</em>' attribute.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority
+	 * @see #isSetPriority()
+	 * @see #unsetPriority()
+	 * @see #setPriority(Priority)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getTopic_Priority()
+	 * @model default="ZERO" unique="false" unsettable="true"
+	 *        extendedMetaData="kind='attribute' name='priority'"
+	 * @generated
+	 */
+	Priority getPriority();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getPriority <em>Priority</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Priority</em>' attribute.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority
+	 * @see #isSetPriority()
+	 * @see #unsetPriority()
+	 * @see #getPriority()
+	 * @generated
+	 */
+	void setPriority(Priority value);
+
+	/**
+	 * Unsets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getPriority <em>Priority</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetPriority()
+	 * @see #getPriority()
+	 * @see #setPriority(Priority)
+	 * @generated
+	 */
+	void unsetPriority();
+
+	/**
+	 * Returns whether the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getPriority <em>Priority</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Priority</em>' attribute is set.
+	 * @see #unsetPriority()
+	 * @see #getPriority()
+	 * @see #setPriority(Priority)
+	 * @generated
+	 */
+	boolean isSetPriority();
+
+	/**
+	 * Returns the value of the '<em><b>Resources</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getTopics <em>Topics</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Resources</em>' reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Resources</em>' reference list.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getTopic_Resources()
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource#getTopics
+	 * @model type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource" opposite="topics"
+	 *        extendedMetaData="kind='attribute' name='resources'"
+	 * @generated
+	 */
+	EList getResources();
+
+	/**
+	 * Returns the value of the '<em><b>Start Date</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Start Date</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Start Date</em>' attribute.
+	 * @see #setStartDate(Object)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getTopic_StartDate()
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Date"
+	 *        extendedMetaData="kind='attribute' name='startDate'"
+	 * @generated
+	 */
+	Object getStartDate();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic#getStartDate <em>Start Date</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Start Date</em>' attribute.
+	 * @see #getStartDate()
+	 * @generated
+	 */
+	void setStartDate(Object value);
+
+	/**
+	 * Returns the value of the '<em><b>Subtopics</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Subtopics</em>' reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Subtopics</em>' reference list.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#getTopic_Subtopics()
+	 * @model type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic"
+	 *        extendedMetaData="kind='attribute' name='subtopics'"
+	 * @generated
+	 */
+	EList getSubtopics();
+
+} // Topic
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/DocumentRootImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/DocumentRootImpl.java
new file mode 100644
index 000000000..7845b9c0a
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/DocumentRootImpl.java
@@ -0,0 +1,279 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DocumentRootImpl.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EMap;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
+
+import org.eclipse.emf.ecore.util.BasicFeatureMap;
+import org.eclipse.emf.ecore.util.EcoreEMap;
+import org.eclipse.emf.ecore.util.FeatureMap;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Document Root</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.DocumentRootImpl#getMixed <em>Mixed</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.DocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.DocumentRootImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.DocumentRootImpl#getMap <em>Map</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DocumentRootImpl extends EObjectImpl implements DocumentRoot {
+	/**
+	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMixed()
+	 * @generated
+	 * @ordered
+	 */
+	protected FeatureMap mixed = null;
+
+	/**
+	 * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getXMLNSPrefixMap()
+	 * @generated
+	 * @ordered
+	 */
+	protected EMap xMLNSPrefixMap = null;
+
+	/**
+	 * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getXSISchemaLocation()
+	 * @generated
+	 * @ordered
+	 */
+	protected EMap xSISchemaLocation = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DocumentRootImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return MindmapPackage.Literals.DOCUMENT_ROOT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FeatureMap getMixed() {
+		if (mixed == null) {
+			mixed = new BasicFeatureMap(this, MindmapPackage.DOCUMENT_ROOT__MIXED);
+		}
+		return mixed;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EMap getXMLNSPrefixMap() {
+		if (xMLNSPrefixMap == null) {
+			xMLNSPrefixMap = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, MindmapPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
+		}
+		return xMLNSPrefixMap;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EMap getXSISchemaLocation() {
+		if (xSISchemaLocation == null) {
+			xSISchemaLocation = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, MindmapPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
+		}
+		return xSISchemaLocation;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Map getMap() {
+		return (Map)getMixed().get(MindmapPackage.Literals.DOCUMENT_ROOT__MAP, true);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetMap(Map newMap, NotificationChain msgs) {
+		return ((FeatureMap.Internal)getMixed()).basicAdd(MindmapPackage.Literals.DOCUMENT_ROOT__MAP, newMap, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMap(Map newMap) {
+		((FeatureMap.Internal)getMixed()).set(MindmapPackage.Literals.DOCUMENT_ROOT__MAP, newMap);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case MindmapPackage.DOCUMENT_ROOT__MIXED:
+				return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
+			case MindmapPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
+				return ((InternalEList)getXMLNSPrefixMap()).basicRemove(otherEnd, msgs);
+			case MindmapPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
+				return ((InternalEList)getXSISchemaLocation()).basicRemove(otherEnd, msgs);
+			case MindmapPackage.DOCUMENT_ROOT__MAP:
+				return basicSetMap(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case MindmapPackage.DOCUMENT_ROOT__MIXED:
+				if (coreType) return getMixed();
+				return ((FeatureMap.Internal)getMixed()).getWrapper();
+			case MindmapPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
+				if (coreType) return getXMLNSPrefixMap();
+				else return getXMLNSPrefixMap().map();
+			case MindmapPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
+				if (coreType) return getXSISchemaLocation();
+				else return getXSISchemaLocation().map();
+			case MindmapPackage.DOCUMENT_ROOT__MAP:
+				return getMap();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case MindmapPackage.DOCUMENT_ROOT__MIXED:
+				((FeatureMap.Internal)getMixed()).set(newValue);
+				return;
+			case MindmapPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
+				((EStructuralFeature.Setting)getXMLNSPrefixMap()).set(newValue);
+				return;
+			case MindmapPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
+				((EStructuralFeature.Setting)getXSISchemaLocation()).set(newValue);
+				return;
+			case MindmapPackage.DOCUMENT_ROOT__MAP:
+				setMap((Map)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case MindmapPackage.DOCUMENT_ROOT__MIXED:
+				getMixed().clear();
+				return;
+			case MindmapPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
+				getXMLNSPrefixMap().clear();
+				return;
+			case MindmapPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
+				getXSISchemaLocation().clear();
+				return;
+			case MindmapPackage.DOCUMENT_ROOT__MAP:
+				setMap((Map)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case MindmapPackage.DOCUMENT_ROOT__MIXED:
+				return mixed != null && !mixed.isEmpty();
+			case MindmapPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
+				return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
+			case MindmapPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
+				return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
+			case MindmapPackage.DOCUMENT_ROOT__MAP:
+				return getMap() != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (mixed: ");
+		result.append(mixed);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DocumentRootImpl
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/MapImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/MapImpl.java
new file mode 100644
index 000000000..9f9083d61
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/MapImpl.java
@@ -0,0 +1,292 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: MapImpl.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Map</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MapImpl#getRootTopics <em>Root Topics</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MapImpl#getRelations <em>Relations</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MapImpl#getResources <em>Resources</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MapImpl#getTitle <em>Title</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class MapImpl extends EObjectImpl implements Map {
+	/**
+	 * The cached value of the '{@link #getRootTopics() <em>Root Topics</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRootTopics()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList rootTopics = null;
+
+	/**
+	 * The cached value of the '{@link #getRelations() <em>Relations</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRelations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList relations = null;
+
+	/**
+	 * The cached value of the '{@link #getResources() <em>Resources</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getResources()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList resources = null;
+
+	/**
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTitle()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TITLE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTitle()
+	 * @generated
+	 * @ordered
+	 */
+	protected String title = TITLE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MapImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return MindmapPackage.Literals.MAP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getRootTopics() {
+		if (rootTopics == null) {
+			rootTopics = new EObjectContainmentEList(Topic.class, this, MindmapPackage.MAP__ROOT_TOPICS);
+		}
+		return rootTopics;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getRelations() {
+		if (relations == null) {
+			relations = new EObjectContainmentEList(Relationship.class, this, MindmapPackage.MAP__RELATIONS);
+		}
+		return relations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getResources() {
+		if (resources == null) {
+			resources = new EObjectContainmentEList(Resource.class, this, MindmapPackage.MAP__RESOURCES);
+		}
+		return resources;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getTitle() {
+		return title;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTitle(String newTitle) {
+		String oldTitle = title;
+		title = newTitle;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.MAP__TITLE, oldTitle, title));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case MindmapPackage.MAP__ROOT_TOPICS:
+				return ((InternalEList)getRootTopics()).basicRemove(otherEnd, msgs);
+			case MindmapPackage.MAP__RELATIONS:
+				return ((InternalEList)getRelations()).basicRemove(otherEnd, msgs);
+			case MindmapPackage.MAP__RESOURCES:
+				return ((InternalEList)getResources()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case MindmapPackage.MAP__ROOT_TOPICS:
+				return getRootTopics();
+			case MindmapPackage.MAP__RELATIONS:
+				return getRelations();
+			case MindmapPackage.MAP__RESOURCES:
+				return getResources();
+			case MindmapPackage.MAP__TITLE:
+				return getTitle();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case MindmapPackage.MAP__ROOT_TOPICS:
+				getRootTopics().clear();
+				getRootTopics().addAll((Collection)newValue);
+				return;
+			case MindmapPackage.MAP__RELATIONS:
+				getRelations().clear();
+				getRelations().addAll((Collection)newValue);
+				return;
+			case MindmapPackage.MAP__RESOURCES:
+				getResources().clear();
+				getResources().addAll((Collection)newValue);
+				return;
+			case MindmapPackage.MAP__TITLE:
+				setTitle((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case MindmapPackage.MAP__ROOT_TOPICS:
+				getRootTopics().clear();
+				return;
+			case MindmapPackage.MAP__RELATIONS:
+				getRelations().clear();
+				return;
+			case MindmapPackage.MAP__RESOURCES:
+				getResources().clear();
+				return;
+			case MindmapPackage.MAP__TITLE:
+				setTitle(TITLE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case MindmapPackage.MAP__ROOT_TOPICS:
+				return rootTopics != null && !rootTopics.isEmpty();
+			case MindmapPackage.MAP__RELATIONS:
+				return relations != null && !relations.isEmpty();
+			case MindmapPackage.MAP__RESOURCES:
+				return resources != null && !resources.isEmpty();
+			case MindmapPackage.MAP__TITLE:
+				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (title: ");
+		result.append(title);
+		result.append(')');
+		return result.toString();
+	}
+
+} //MapImpl
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/MindmapFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/MindmapFactoryImpl.java
new file mode 100644
index 000000000..e3c769aac
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/MindmapFactoryImpl.java
@@ -0,0 +1,289 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: MindmapFactoryImpl.java,v 1.1 2006/11/15 17:18:16 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapFactory;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class MindmapFactoryImpl extends EFactoryImpl implements MindmapFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static MindmapFactory init() {
+		try {
+			MindmapFactory theMindmapFactory = (MindmapFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap"); 
+			if (theMindmapFactory != null) {
+				return theMindmapFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new MindmapFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public MindmapFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case MindmapPackage.DOCUMENT_ROOT: return createDocumentRoot();
+			case MindmapPackage.MAP: return createMap();
+			case MindmapPackage.RELATIONSHIP: return createRelationship();
+			case MindmapPackage.RESOURCE: return createResource();
+			case MindmapPackage.THREAD: return createThread();
+			case MindmapPackage.THREAD_ITEM: return createThreadItem();
+			case MindmapPackage.TOPIC: return createTopic();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object createFromString(EDataType eDataType, String initialValue) {
+		switch (eDataType.getClassifierID()) {
+			case MindmapPackage.PRIORITY:
+				return createPriorityFromString(eDataType, initialValue);
+			case MindmapPackage.RELATIONSHIP_TYPE:
+				return createRelationshipTypeFromString(eDataType, initialValue);
+			case MindmapPackage.PRIORITY_OBJECT:
+				return createPriorityObjectFromString(eDataType, initialValue);
+			case MindmapPackage.RELATIONSHIP_TYPE_OBJECT:
+				return createRelationshipTypeObjectFromString(eDataType, initialValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
+			case MindmapPackage.PRIORITY:
+				return convertPriorityToString(eDataType, instanceValue);
+			case MindmapPackage.RELATIONSHIP_TYPE:
+				return convertRelationshipTypeToString(eDataType, instanceValue);
+			case MindmapPackage.PRIORITY_OBJECT:
+				return convertPriorityObjectToString(eDataType, instanceValue);
+			case MindmapPackage.RELATIONSHIP_TYPE_OBJECT:
+				return convertRelationshipTypeObjectToString(eDataType, instanceValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DocumentRoot createDocumentRoot() {
+		DocumentRootImpl documentRoot = new DocumentRootImpl();
+		return documentRoot;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Map createMap() {
+		MapImpl map = new MapImpl();
+		return map;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Relationship createRelationship() {
+		RelationshipImpl relationship = new RelationshipImpl();
+		return relationship;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Resource createResource() {
+		ResourceImpl resource = new ResourceImpl();
+		return resource;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread createThread() {
+		ThreadImpl thread = new ThreadImpl();
+		return thread;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ThreadItem createThreadItem() {
+		ThreadItemImpl threadItem = new ThreadItemImpl();
+		return threadItem;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Topic createTopic() {
+		TopicImpl topic = new TopicImpl();
+		return topic;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Priority createPriorityFromString(EDataType eDataType, String initialValue) {
+		Priority result = Priority.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertPriorityToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RelationshipType createRelationshipTypeFromString(EDataType eDataType, String initialValue) {
+		RelationshipType result = RelationshipType.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertRelationshipTypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Priority createPriorityObjectFromString(EDataType eDataType, String initialValue) {
+		return (Priority)createPriorityFromString(MindmapPackage.Literals.PRIORITY, initialValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertPriorityObjectToString(EDataType eDataType, Object instanceValue) {
+		return convertPriorityToString(MindmapPackage.Literals.PRIORITY, instanceValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RelationshipType createRelationshipTypeObjectFromString(EDataType eDataType, String initialValue) {
+		return (RelationshipType)createRelationshipTypeFromString(MindmapPackage.Literals.RELATIONSHIP_TYPE, initialValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertRelationshipTypeObjectToString(EDataType eDataType, Object instanceValue) {
+		return convertRelationshipTypeToString(MindmapPackage.Literals.RELATIONSHIP_TYPE, instanceValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public MindmapPackage getMindmapPackage() {
+		return (MindmapPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	public static MindmapPackage getPackage() {
+		return MindmapPackage.eINSTANCE;
+	}
+
+} //MindmapFactoryImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/MindmapPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/MindmapPackageImpl.java
new file mode 100644
index 000000000..8251875c7
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/MindmapPackageImpl.java
@@ -0,0 +1,1067 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: MindmapPackageImpl.java,v 1.1 2006/11/15 17:18:16 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
+
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapFactory;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class MindmapPackageImpl extends EPackageImpl implements MindmapPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass documentRootEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass mapEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass relationshipEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass resourceEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass threadEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass threadItemEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass topicEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum priorityEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum relationshipTypeEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EDataType priorityObjectEDataType = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EDataType relationshipTypeObjectEDataType = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private MindmapPackageImpl() {
+		super(eNS_URI, MindmapFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this
+	 * model, and for any others upon which it depends.  Simple
+	 * dependencies are satisfied by calling this method on all
+	 * dependent packages before doing anything else.  This method drives
+	 * initialization for interdependent packages directly, in parallel
+	 * with this package, itself.
+	 * <p>Of this package and its interdependencies, all packages which
+	 * have not yet been registered by their URI values are first created
+	 * and registered.  The packages are then initialized in two steps:
+	 * meta-model objects for all of the packages are created before any
+	 * are initialized, since one package's meta-model objects may refer to
+	 * those of another.
+	 * <p>Invocation of this method will not affect any packages that have
+	 * already been initialized.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static MindmapPackage init() {
+		if (isInited) return (MindmapPackage)EPackage.Registry.INSTANCE.getEPackage(MindmapPackage.eNS_URI);
+
+		// Obtain or create and register package
+		MindmapPackageImpl theMindmapPackage = (MindmapPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof MindmapPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new MindmapPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		XMLTypePackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theMindmapPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theMindmapPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theMindmapPackage.freeze();
+
+		return theMindmapPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDocumentRoot() {
+		return documentRootEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDocumentRoot_Mixed() {
+		return (EAttribute)documentRootEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDocumentRoot_XMLNSPrefixMap() {
+		return (EReference)documentRootEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDocumentRoot_XSISchemaLocation() {
+		return (EReference)documentRootEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDocumentRoot_Map() {
+		return (EReference)documentRootEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getMap() {
+		return mapEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getMap_RootTopics() {
+		return (EReference)mapEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getMap_Relations() {
+		return (EReference)mapEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getMap_Resources() {
+		return (EReference)mapEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getMap_Title() {
+		return (EAttribute)mapEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getRelationship() {
+		return relationshipEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getRelationship_Label() {
+		return (EAttribute)relationshipEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getRelationship_Source() {
+		return (EReference)relationshipEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getRelationship_Target() {
+		return (EReference)relationshipEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getRelationship_Type() {
+		return (EAttribute)relationshipEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getResource() {
+		return resourceEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getResource_Comments() {
+		return (EReference)resourceEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getResource_Email() {
+		return (EAttribute)resourceEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getResource_Name() {
+		return (EAttribute)resourceEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getResource_Topics() {
+		return (EReference)resourceEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getThread() {
+		return threadEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getThread_Items() {
+		return (EReference)threadEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getThread_Author() {
+		return (EReference)threadEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getThread_PostDate() {
+		return (EAttribute)threadEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getThread_Subject() {
+		return (EAttribute)threadEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getThreadItem() {
+		return threadItemEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getThreadItem_Author() {
+		return (EReference)threadItemEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getThreadItem_Body() {
+		return (EAttribute)threadItemEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getThreadItem_ItemPostDate() {
+		return (EAttribute)threadItemEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getTopic() {
+		return topicEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getTopic_Comments() {
+		return (EReference)topicEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getTopic_Duration() {
+		return (EAttribute)topicEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getTopic_EndDate() {
+		return (EAttribute)topicEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getTopic_Name() {
+		return (EAttribute)topicEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getTopic_PercentComplete() {
+		return (EAttribute)topicEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getTopic_Priority() {
+		return (EAttribute)topicEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getTopic_Resources() {
+		return (EReference)topicEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getTopic_StartDate() {
+		return (EAttribute)topicEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getTopic_Subtopics() {
+		return (EReference)topicEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EEnum getPriority() {
+		return priorityEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EEnum getRelationshipType() {
+		return relationshipTypeEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EDataType getPriorityObject() {
+		return priorityObjectEDataType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EDataType getRelationshipTypeObject() {
+		return relationshipTypeObjectEDataType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public MindmapFactory getMindmapFactory() {
+		return (MindmapFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		documentRootEClass = createEClass(DOCUMENT_ROOT);
+		createEAttribute(documentRootEClass, DOCUMENT_ROOT__MIXED);
+		createEReference(documentRootEClass, DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
+		createEReference(documentRootEClass, DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
+		createEReference(documentRootEClass, DOCUMENT_ROOT__MAP);
+
+		mapEClass = createEClass(MAP);
+		createEReference(mapEClass, MAP__ROOT_TOPICS);
+		createEReference(mapEClass, MAP__RELATIONS);
+		createEReference(mapEClass, MAP__RESOURCES);
+		createEAttribute(mapEClass, MAP__TITLE);
+
+		relationshipEClass = createEClass(RELATIONSHIP);
+		createEAttribute(relationshipEClass, RELATIONSHIP__LABEL);
+		createEReference(relationshipEClass, RELATIONSHIP__SOURCE);
+		createEReference(relationshipEClass, RELATIONSHIP__TARGET);
+		createEAttribute(relationshipEClass, RELATIONSHIP__TYPE);
+
+		resourceEClass = createEClass(RESOURCE);
+		createEReference(resourceEClass, RESOURCE__COMMENTS);
+		createEAttribute(resourceEClass, RESOURCE__EMAIL);
+		createEAttribute(resourceEClass, RESOURCE__NAME);
+		createEReference(resourceEClass, RESOURCE__TOPICS);
+
+		threadEClass = createEClass(THREAD);
+		createEReference(threadEClass, THREAD__ITEMS);
+		createEReference(threadEClass, THREAD__AUTHOR);
+		createEAttribute(threadEClass, THREAD__POST_DATE);
+		createEAttribute(threadEClass, THREAD__SUBJECT);
+
+		threadItemEClass = createEClass(THREAD_ITEM);
+		createEReference(threadItemEClass, THREAD_ITEM__AUTHOR);
+		createEAttribute(threadItemEClass, THREAD_ITEM__BODY);
+		createEAttribute(threadItemEClass, THREAD_ITEM__ITEM_POST_DATE);
+
+		topicEClass = createEClass(TOPIC);
+		createEReference(topicEClass, TOPIC__COMMENTS);
+		createEAttribute(topicEClass, TOPIC__DURATION);
+		createEAttribute(topicEClass, TOPIC__END_DATE);
+		createEAttribute(topicEClass, TOPIC__NAME);
+		createEAttribute(topicEClass, TOPIC__PERCENT_COMPLETE);
+		createEAttribute(topicEClass, TOPIC__PRIORITY);
+		createEReference(topicEClass, TOPIC__RESOURCES);
+		createEAttribute(topicEClass, TOPIC__START_DATE);
+		createEReference(topicEClass, TOPIC__SUBTOPICS);
+
+		// Create enums
+		priorityEEnum = createEEnum(PRIORITY);
+		relationshipTypeEEnum = createEEnum(RELATIONSHIP_TYPE);
+
+		// Create data types
+		priorityObjectEDataType = createEDataType(PRIORITY_OBJECT);
+		relationshipTypeObjectEDataType = createEDataType(RELATIONSHIP_TYPE_OBJECT);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
+
+		// Add supertypes to classes
+
+		// Initialize classes and features; add operations and parameters
+		initEClass(documentRootEClass, DocumentRoot.class, "DocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDocumentRoot_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDocumentRoot_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDocumentRoot_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDocumentRoot_Map(), this.getMap(), null, "map", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+
+		initEClass(mapEClass, Map.class, "Map", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getMap_RootTopics(), this.getTopic(), null, "rootTopics", null, 0, -1, Map.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getMap_Relations(), this.getRelationship(), null, "relations", null, 0, -1, Map.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getMap_Resources(), this.getResource(), null, "resources", null, 0, -1, Map.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMap_Title(), theXMLTypePackage.getString(), "title", null, 0, 1, Map.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(relationshipEClass, Relationship.class, "Relationship", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getRelationship_Label(), theXMLTypePackage.getString(), "label", null, 0, 1, Relationship.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getRelationship_Source(), this.getTopic(), null, "source", null, 0, 1, Relationship.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getRelationship_Target(), this.getTopic(), null, "target", null, 0, 1, Relationship.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getRelationship_Type(), this.getRelationshipType(), "type", "DEPENDENCY", 0, 1, Relationship.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(resourceEClass, Resource.class, "Resource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getResource_Comments(), this.getThread(), this.getThread_Author(), "comments", null, 0, -1, Resource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getResource_Email(), theXMLTypePackage.getString(), "email", null, 0, 1, Resource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getResource_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Resource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getResource_Topics(), this.getTopic(), this.getTopic_Resources(), "topics", null, 0, -1, Resource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(threadEClass, org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread.class, "Thread", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getThread_Items(), this.getThreadItem(), null, "items", null, 0, -1, org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getThread_Author(), this.getResource(), this.getResource_Comments(), "author", null, 0, 1, org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getThread_PostDate(), theXMLTypePackage.getDate(), "postDate", null, 0, 1, org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getThread_Subject(), theXMLTypePackage.getString(), "subject", null, 0, 1, org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(threadItemEClass, ThreadItem.class, "ThreadItem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getThreadItem_Author(), this.getResource(), null, "author", null, 0, 1, ThreadItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getThreadItem_Body(), theXMLTypePackage.getString(), "body", null, 0, 1, ThreadItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getThreadItem_ItemPostDate(), theXMLTypePackage.getDate(), "itemPostDate", null, 0, 1, ThreadItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(topicEClass, Topic.class, "Topic", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getTopic_Comments(), this.getThread(), null, "comments", null, 0, -1, Topic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTopic_Duration(), theXMLTypePackage.getFloat(), "duration", "0", 0, 1, Topic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTopic_EndDate(), theXMLTypePackage.getDate(), "endDate", null, 0, 1, Topic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTopic_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Topic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTopic_PercentComplete(), theXMLTypePackage.getFloat(), "percentComplete", null, 0, 1, Topic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTopic_Priority(), this.getPriority(), "priority", "ZERO", 0, 1, Topic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTopic_Resources(), this.getResource(), this.getResource_Topics(), "resources", null, 0, -1, Topic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTopic_StartDate(), theXMLTypePackage.getDate(), "startDate", null, 0, 1, Topic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTopic_Subtopics(), this.getTopic(), null, "subtopics", null, 0, -1, Topic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Initialize enums and add enum literals
+		initEEnum(priorityEEnum, Priority.class, "Priority");
+		addEEnumLiteral(priorityEEnum, Priority.ZERO_LITERAL);
+		addEEnumLiteral(priorityEEnum, Priority.ONE_LITERAL);
+		addEEnumLiteral(priorityEEnum, Priority.TWO_LITERAL);
+		addEEnumLiteral(priorityEEnum, Priority.THREE_LITERAL);
+		addEEnumLiteral(priorityEEnum, Priority.FOUR_LITERAL);
+		addEEnumLiteral(priorityEEnum, Priority.FIVE_LITERAL);
+
+		initEEnum(relationshipTypeEEnum, RelationshipType.class, "RelationshipType");
+		addEEnumLiteral(relationshipTypeEEnum, RelationshipType.DEPENDENCY_LITERAL);
+		addEEnumLiteral(relationshipTypeEEnum, RelationshipType.INCLUDES_LITERAL);
+		addEEnumLiteral(relationshipTypeEEnum, RelationshipType.EXTENDS_LITERAL);
+
+		// Initialize data types
+		initEDataType(priorityObjectEDataType, Priority.class, "PriorityObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(relationshipTypeObjectEDataType, RelationshipType.class, "RelationshipTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS);
+
+		// Create resource
+		createResource(eNS_URI);
+
+		// Create annotations
+		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
+		createExtendedMetaDataAnnotations();
+	}
+
+	/**
+	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createExtendedMetaDataAnnotations() {
+		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";		
+		addAnnotation
+		  (documentRootEClass, 
+		   source, 
+		   new String[] {
+			 "name", "",
+			 "kind", "mixed"
+		   });		
+		addAnnotation
+		  (getDocumentRoot_Mixed(), 
+		   source, 
+		   new String[] {
+			 "kind", "elementWildcard",
+			 "name", ":mixed"
+		   });		
+		addAnnotation
+		  (getDocumentRoot_XMLNSPrefixMap(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "xmlns:prefix"
+		   });		
+		addAnnotation
+		  (getDocumentRoot_XSISchemaLocation(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "xsi:schemaLocation"
+		   });		
+		addAnnotation
+		  (getDocumentRoot_Map(), 
+		   source, 
+		   new String[] {
+			 "kind", "element",
+			 "name", "map",
+			 "namespace", "##targetNamespace"
+		   });		
+		addAnnotation
+		  (mapEClass, 
+		   source, 
+		   new String[] {
+			 "name", "Map",
+			 "kind", "elementOnly"
+		   });		
+		addAnnotation
+		  (getMap_RootTopics(), 
+		   source, 
+		   new String[] {
+			 "kind", "element",
+			 "name", "rootTopics"
+		   });		
+		addAnnotation
+		  (getMap_Relations(), 
+		   source, 
+		   new String[] {
+			 "kind", "element",
+			 "name", "relations"
+		   });		
+		addAnnotation
+		  (getMap_Resources(), 
+		   source, 
+		   new String[] {
+			 "kind", "element",
+			 "name", "resources"
+		   });		
+		addAnnotation
+		  (getMap_Title(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "title"
+		   });		
+		addAnnotation
+		  (priorityEEnum, 
+		   source, 
+		   new String[] {
+			 "name", "Priority"
+		   });		
+		addAnnotation
+		  (priorityObjectEDataType, 
+		   source, 
+		   new String[] {
+			 "name", "Priority:Object",
+			 "baseType", "Priority"
+		   });		
+		addAnnotation
+		  (relationshipEClass, 
+		   source, 
+		   new String[] {
+			 "name", "Relationship",
+			 "kind", "empty"
+		   });		
+		addAnnotation
+		  (getRelationship_Label(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "label"
+		   });		
+		addAnnotation
+		  (getRelationship_Source(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "source"
+		   });		
+		addAnnotation
+		  (getRelationship_Target(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "target"
+		   });		
+		addAnnotation
+		  (getRelationship_Type(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "type"
+		   });		
+		addAnnotation
+		  (relationshipTypeEEnum, 
+		   source, 
+		   new String[] {
+			 "name", "RelationshipType"
+		   });		
+		addAnnotation
+		  (relationshipTypeObjectEDataType, 
+		   source, 
+		   new String[] {
+			 "name", "RelationshipType:Object",
+			 "baseType", "RelationshipType"
+		   });		
+		addAnnotation
+		  (resourceEClass, 
+		   source, 
+		   new String[] {
+			 "name", "Resource",
+			 "kind", "empty"
+		   });		
+		addAnnotation
+		  (getResource_Comments(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "comments"
+		   });		
+		addAnnotation
+		  (getResource_Email(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "email"
+		   });		
+		addAnnotation
+		  (getResource_Name(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "name"
+		   });		
+		addAnnotation
+		  (getResource_Topics(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "topics"
+		   });		
+		addAnnotation
+		  (threadEClass, 
+		   source, 
+		   new String[] {
+			 "name", "Thread",
+			 "kind", "elementOnly"
+		   });		
+		addAnnotation
+		  (getThread_Items(), 
+		   source, 
+		   new String[] {
+			 "kind", "element",
+			 "name", "items"
+		   });		
+		addAnnotation
+		  (getThread_Author(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "author"
+		   });		
+		addAnnotation
+		  (getThread_PostDate(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "postDate"
+		   });		
+		addAnnotation
+		  (getThread_Subject(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "subject"
+		   });		
+		addAnnotation
+		  (threadItemEClass, 
+		   source, 
+		   new String[] {
+			 "name", "ThreadItem",
+			 "kind", "empty"
+		   });		
+		addAnnotation
+		  (getThreadItem_Author(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "author"
+		   });		
+		addAnnotation
+		  (getThreadItem_Body(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "body"
+		   });		
+		addAnnotation
+		  (getThreadItem_ItemPostDate(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "itemPostDate"
+		   });		
+		addAnnotation
+		  (topicEClass, 
+		   source, 
+		   new String[] {
+			 "name", "Topic",
+			 "kind", "elementOnly"
+		   });		
+		addAnnotation
+		  (getTopic_Comments(), 
+		   source, 
+		   new String[] {
+			 "kind", "element",
+			 "name", "comments"
+		   });		
+		addAnnotation
+		  (getTopic_Duration(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "duration"
+		   });		
+		addAnnotation
+		  (getTopic_EndDate(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "endDate"
+		   });		
+		addAnnotation
+		  (getTopic_Name(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "name"
+		   });		
+		addAnnotation
+		  (getTopic_PercentComplete(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "percentComplete"
+		   });		
+		addAnnotation
+		  (getTopic_Priority(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "priority"
+		   });		
+		addAnnotation
+		  (getTopic_Resources(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "resources"
+		   });		
+		addAnnotation
+		  (getTopic_StartDate(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "startDate"
+		   });		
+		addAnnotation
+		  (getTopic_Subtopics(), 
+		   source, 
+		   new String[] {
+			 "kind", "attribute",
+			 "name", "subtopics"
+		   });
+	}
+
+} //MindmapPackageImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/RelationshipImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/RelationshipImpl.java
new file mode 100644
index 000000000..8eee11e9d
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/RelationshipImpl.java
@@ -0,0 +1,372 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: RelationshipImpl.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Relationship</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.RelationshipImpl#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.RelationshipImpl#getSource <em>Source</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.RelationshipImpl#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.RelationshipImpl#getType <em>Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class RelationshipImpl extends EObjectImpl implements Relationship {
+	/**
+	 * The default value of the '{@link #getLabel() <em>Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLabel()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LABEL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLabel() <em>Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLabel()
+	 * @generated
+	 * @ordered
+	 */
+	protected String label = LABEL_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getSource() <em>Source</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSource()
+	 * @generated
+	 * @ordered
+	 */
+	protected Topic source = null;
+
+	/**
+	 * The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTarget()
+	 * @generated
+	 * @ordered
+	 */
+	protected Topic target = null;
+
+	/**
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final RelationshipType TYPE_EDEFAULT = RelationshipType.DEPENDENCY_LITERAL;
+
+	/**
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getType()
+	 * @generated
+	 * @ordered
+	 */
+	protected RelationshipType type = TYPE_EDEFAULT;
+
+	/**
+	 * This is true if the Type attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean typeESet = false;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected RelationshipImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return MindmapPackage.Literals.RELATIONSHIP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLabel() {
+		return label;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLabel(String newLabel) {
+		String oldLabel = label;
+		label = newLabel;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.RELATIONSHIP__LABEL, oldLabel, label));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Topic getSource() {
+		if (source != null && source.eIsProxy()) {
+			InternalEObject oldSource = (InternalEObject)source;
+			source = (Topic)eResolveProxy(oldSource);
+			if (source != oldSource) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MindmapPackage.RELATIONSHIP__SOURCE, oldSource, source));
+			}
+		}
+		return source;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Topic basicGetSource() {
+		return source;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSource(Topic newSource) {
+		Topic oldSource = source;
+		source = newSource;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.RELATIONSHIP__SOURCE, oldSource, source));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Topic getTarget() {
+		if (target != null && target.eIsProxy()) {
+			InternalEObject oldTarget = (InternalEObject)target;
+			target = (Topic)eResolveProxy(oldTarget);
+			if (target != oldTarget) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MindmapPackage.RELATIONSHIP__TARGET, oldTarget, target));
+			}
+		}
+		return target;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Topic basicGetTarget() {
+		return target;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTarget(Topic newTarget) {
+		Topic oldTarget = target;
+		target = newTarget;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.RELATIONSHIP__TARGET, oldTarget, target));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RelationshipType getType() {
+		return type;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setType(RelationshipType newType) {
+		RelationshipType oldType = type;
+		type = newType == null ? TYPE_EDEFAULT : newType;
+		boolean oldTypeESet = typeESet;
+		typeESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.RELATIONSHIP__TYPE, oldType, type, !oldTypeESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetType() {
+		RelationshipType oldType = type;
+		boolean oldTypeESet = typeESet;
+		type = TYPE_EDEFAULT;
+		typeESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, MindmapPackage.RELATIONSHIP__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetType() {
+		return typeESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case MindmapPackage.RELATIONSHIP__LABEL:
+				return getLabel();
+			case MindmapPackage.RELATIONSHIP__SOURCE:
+				if (resolve) return getSource();
+				return basicGetSource();
+			case MindmapPackage.RELATIONSHIP__TARGET:
+				if (resolve) return getTarget();
+				return basicGetTarget();
+			case MindmapPackage.RELATIONSHIP__TYPE:
+				return getType();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case MindmapPackage.RELATIONSHIP__LABEL:
+				setLabel((String)newValue);
+				return;
+			case MindmapPackage.RELATIONSHIP__SOURCE:
+				setSource((Topic)newValue);
+				return;
+			case MindmapPackage.RELATIONSHIP__TARGET:
+				setTarget((Topic)newValue);
+				return;
+			case MindmapPackage.RELATIONSHIP__TYPE:
+				setType((RelationshipType)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case MindmapPackage.RELATIONSHIP__LABEL:
+				setLabel(LABEL_EDEFAULT);
+				return;
+			case MindmapPackage.RELATIONSHIP__SOURCE:
+				setSource((Topic)null);
+				return;
+			case MindmapPackage.RELATIONSHIP__TARGET:
+				setTarget((Topic)null);
+				return;
+			case MindmapPackage.RELATIONSHIP__TYPE:
+				unsetType();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case MindmapPackage.RELATIONSHIP__LABEL:
+				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
+			case MindmapPackage.RELATIONSHIP__SOURCE:
+				return source != null;
+			case MindmapPackage.RELATIONSHIP__TARGET:
+				return target != null;
+			case MindmapPackage.RELATIONSHIP__TYPE:
+				return isSetType();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (label: ");
+		result.append(label);
+		result.append(", type: ");
+		if (typeESet) result.append(type); else result.append("<unset>");
+		result.append(')');
+		return result.toString();
+	}
+
+} //RelationshipImpl
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/ResourceImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/ResourceImpl.java
new file mode 100644
index 000000000..5e0cd92ed
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/ResourceImpl.java
@@ -0,0 +1,323 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ResourceImpl.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Resource</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl#getComments <em>Comments</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl#getEmail <em>Email</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl#getTopics <em>Topics</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ResourceImpl extends EObjectImpl implements Resource {
+	/**
+	 * The cached value of the '{@link #getComments() <em>Comments</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getComments()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList comments = null;
+
+	/**
+	 * The default value of the '{@link #getEmail() <em>Email</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEmail()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String EMAIL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getEmail() <em>Email</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEmail()
+	 * @generated
+	 * @ordered
+	 */
+	protected String email = EMAIL_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getTopics() <em>Topics</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTopics()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList topics = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ResourceImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return MindmapPackage.Literals.RESOURCE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getComments() {
+		if (comments == null) {
+			comments = new EObjectWithInverseResolvingEList(org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread.class, this, MindmapPackage.RESOURCE__COMMENTS, MindmapPackage.THREAD__AUTHOR);
+		}
+		return comments;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getEmail() {
+		return email;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setEmail(String newEmail) {
+		String oldEmail = email;
+		email = newEmail;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.RESOURCE__EMAIL, oldEmail, email));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.RESOURCE__NAME, oldName, name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getTopics() {
+		if (topics == null) {
+			topics = new EObjectWithInverseResolvingEList.ManyInverse(Topic.class, this, MindmapPackage.RESOURCE__TOPICS, MindmapPackage.TOPIC__RESOURCES);
+		}
+		return topics;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case MindmapPackage.RESOURCE__COMMENTS:
+				return ((InternalEList)getComments()).basicAdd(otherEnd, msgs);
+			case MindmapPackage.RESOURCE__TOPICS:
+				return ((InternalEList)getTopics()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case MindmapPackage.RESOURCE__COMMENTS:
+				return ((InternalEList)getComments()).basicRemove(otherEnd, msgs);
+			case MindmapPackage.RESOURCE__TOPICS:
+				return ((InternalEList)getTopics()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case MindmapPackage.RESOURCE__COMMENTS:
+				return getComments();
+			case MindmapPackage.RESOURCE__EMAIL:
+				return getEmail();
+			case MindmapPackage.RESOURCE__NAME:
+				return getName();
+			case MindmapPackage.RESOURCE__TOPICS:
+				return getTopics();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case MindmapPackage.RESOURCE__COMMENTS:
+				getComments().clear();
+				getComments().addAll((Collection)newValue);
+				return;
+			case MindmapPackage.RESOURCE__EMAIL:
+				setEmail((String)newValue);
+				return;
+			case MindmapPackage.RESOURCE__NAME:
+				setName((String)newValue);
+				return;
+			case MindmapPackage.RESOURCE__TOPICS:
+				getTopics().clear();
+				getTopics().addAll((Collection)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case MindmapPackage.RESOURCE__COMMENTS:
+				getComments().clear();
+				return;
+			case MindmapPackage.RESOURCE__EMAIL:
+				setEmail(EMAIL_EDEFAULT);
+				return;
+			case MindmapPackage.RESOURCE__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case MindmapPackage.RESOURCE__TOPICS:
+				getTopics().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case MindmapPackage.RESOURCE__COMMENTS:
+				return comments != null && !comments.isEmpty();
+			case MindmapPackage.RESOURCE__EMAIL:
+				return EMAIL_EDEFAULT == null ? email != null : !EMAIL_EDEFAULT.equals(email);
+			case MindmapPackage.RESOURCE__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case MindmapPackage.RESOURCE__TOPICS:
+				return topics != null && !topics.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (email: ");
+		result.append(email);
+		result.append(", name: ");
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ResourceImpl
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/ThreadImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/ThreadImpl.java
new file mode 100644
index 000000000..70b0154cf
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/ThreadImpl.java
@@ -0,0 +1,371 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ThreadImpl.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Thread</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl#getItems <em>Items</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl#getAuthor <em>Author</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl#getPostDate <em>Post Date</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl#getSubject <em>Subject</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ThreadImpl extends EObjectImpl implements org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread {
+	/**
+	 * The cached value of the '{@link #getItems() <em>Items</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getItems()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList items = null;
+
+	/**
+	 * The cached value of the '{@link #getAuthor() <em>Author</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAuthor()
+	 * @generated
+	 * @ordered
+	 */
+	protected Resource author = null;
+
+	/**
+	 * The default value of the '{@link #getPostDate() <em>Post Date</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPostDate()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Object POST_DATE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPostDate() <em>Post Date</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPostDate()
+	 * @generated
+	 * @ordered
+	 */
+	protected Object postDate = POST_DATE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getSubject() <em>Subject</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSubject()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SUBJECT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getSubject() <em>Subject</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSubject()
+	 * @generated
+	 * @ordered
+	 */
+	protected String subject = SUBJECT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ThreadImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return MindmapPackage.Literals.THREAD;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getItems() {
+		if (items == null) {
+			items = new EObjectContainmentEList(ThreadItem.class, this, MindmapPackage.THREAD__ITEMS);
+		}
+		return items;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Resource getAuthor() {
+		if (author != null && author.eIsProxy()) {
+			InternalEObject oldAuthor = (InternalEObject)author;
+			author = (Resource)eResolveProxy(oldAuthor);
+			if (author != oldAuthor) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MindmapPackage.THREAD__AUTHOR, oldAuthor, author));
+			}
+		}
+		return author;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Resource basicGetAuthor() {
+		return author;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetAuthor(Resource newAuthor, NotificationChain msgs) {
+		Resource oldAuthor = author;
+		author = newAuthor;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MindmapPackage.THREAD__AUTHOR, oldAuthor, newAuthor);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAuthor(Resource newAuthor) {
+		if (newAuthor != author) {
+			NotificationChain msgs = null;
+			if (author != null)
+				msgs = ((InternalEObject)author).eInverseRemove(this, MindmapPackage.RESOURCE__COMMENTS, Resource.class, msgs);
+			if (newAuthor != null)
+				msgs = ((InternalEObject)newAuthor).eInverseAdd(this, MindmapPackage.RESOURCE__COMMENTS, Resource.class, msgs);
+			msgs = basicSetAuthor(newAuthor, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.THREAD__AUTHOR, newAuthor, newAuthor));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getPostDate() {
+		return postDate;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPostDate(Object newPostDate) {
+		Object oldPostDate = postDate;
+		postDate = newPostDate;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.THREAD__POST_DATE, oldPostDate, postDate));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getSubject() {
+		return subject;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSubject(String newSubject) {
+		String oldSubject = subject;
+		subject = newSubject;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.THREAD__SUBJECT, oldSubject, subject));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case MindmapPackage.THREAD__AUTHOR:
+				if (author != null)
+					msgs = ((InternalEObject)author).eInverseRemove(this, MindmapPackage.RESOURCE__COMMENTS, Resource.class, msgs);
+				return basicSetAuthor((Resource)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case MindmapPackage.THREAD__ITEMS:
+				return ((InternalEList)getItems()).basicRemove(otherEnd, msgs);
+			case MindmapPackage.THREAD__AUTHOR:
+				return basicSetAuthor(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case MindmapPackage.THREAD__ITEMS:
+				return getItems();
+			case MindmapPackage.THREAD__AUTHOR:
+				if (resolve) return getAuthor();
+				return basicGetAuthor();
+			case MindmapPackage.THREAD__POST_DATE:
+				return getPostDate();
+			case MindmapPackage.THREAD__SUBJECT:
+				return getSubject();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case MindmapPackage.THREAD__ITEMS:
+				getItems().clear();
+				getItems().addAll((Collection)newValue);
+				return;
+			case MindmapPackage.THREAD__AUTHOR:
+				setAuthor((Resource)newValue);
+				return;
+			case MindmapPackage.THREAD__POST_DATE:
+				setPostDate((Object)newValue);
+				return;
+			case MindmapPackage.THREAD__SUBJECT:
+				setSubject((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case MindmapPackage.THREAD__ITEMS:
+				getItems().clear();
+				return;
+			case MindmapPackage.THREAD__AUTHOR:
+				setAuthor((Resource)null);
+				return;
+			case MindmapPackage.THREAD__POST_DATE:
+				setPostDate(POST_DATE_EDEFAULT);
+				return;
+			case MindmapPackage.THREAD__SUBJECT:
+				setSubject(SUBJECT_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case MindmapPackage.THREAD__ITEMS:
+				return items != null && !items.isEmpty();
+			case MindmapPackage.THREAD__AUTHOR:
+				return author != null;
+			case MindmapPackage.THREAD__POST_DATE:
+				return POST_DATE_EDEFAULT == null ? postDate != null : !POST_DATE_EDEFAULT.equals(postDate);
+			case MindmapPackage.THREAD__SUBJECT:
+				return SUBJECT_EDEFAULT == null ? subject != null : !SUBJECT_EDEFAULT.equals(subject);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (postDate: ");
+		result.append(postDate);
+		result.append(", subject: ");
+		result.append(subject);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ThreadImpl
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/ThreadItemImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/ThreadItemImpl.java
new file mode 100644
index 000000000..596e5b76e
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/ThreadItemImpl.java
@@ -0,0 +1,277 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ThreadItemImpl.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Thread Item</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadItemImpl#getAuthor <em>Author</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadItemImpl#getBody <em>Body</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadItemImpl#getItemPostDate <em>Item Post Date</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ThreadItemImpl extends EObjectImpl implements ThreadItem {
+	/**
+	 * The cached value of the '{@link #getAuthor() <em>Author</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAuthor()
+	 * @generated
+	 * @ordered
+	 */
+	protected Resource author = null;
+
+	/**
+	 * The default value of the '{@link #getBody() <em>Body</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBody()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String BODY_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBody()
+	 * @generated
+	 * @ordered
+	 */
+	protected String body = BODY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getItemPostDate() <em>Item Post Date</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getItemPostDate()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Object ITEM_POST_DATE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getItemPostDate() <em>Item Post Date</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getItemPostDate()
+	 * @generated
+	 * @ordered
+	 */
+	protected Object itemPostDate = ITEM_POST_DATE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ThreadItemImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return MindmapPackage.Literals.THREAD_ITEM;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Resource getAuthor() {
+		if (author != null && author.eIsProxy()) {
+			InternalEObject oldAuthor = (InternalEObject)author;
+			author = (Resource)eResolveProxy(oldAuthor);
+			if (author != oldAuthor) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MindmapPackage.THREAD_ITEM__AUTHOR, oldAuthor, author));
+			}
+		}
+		return author;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Resource basicGetAuthor() {
+		return author;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAuthor(Resource newAuthor) {
+		Resource oldAuthor = author;
+		author = newAuthor;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.THREAD_ITEM__AUTHOR, oldAuthor, author));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getBody() {
+		return body;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setBody(String newBody) {
+		String oldBody = body;
+		body = newBody;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.THREAD_ITEM__BODY, oldBody, body));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getItemPostDate() {
+		return itemPostDate;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setItemPostDate(Object newItemPostDate) {
+		Object oldItemPostDate = itemPostDate;
+		itemPostDate = newItemPostDate;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.THREAD_ITEM__ITEM_POST_DATE, oldItemPostDate, itemPostDate));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case MindmapPackage.THREAD_ITEM__AUTHOR:
+				if (resolve) return getAuthor();
+				return basicGetAuthor();
+			case MindmapPackage.THREAD_ITEM__BODY:
+				return getBody();
+			case MindmapPackage.THREAD_ITEM__ITEM_POST_DATE:
+				return getItemPostDate();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case MindmapPackage.THREAD_ITEM__AUTHOR:
+				setAuthor((Resource)newValue);
+				return;
+			case MindmapPackage.THREAD_ITEM__BODY:
+				setBody((String)newValue);
+				return;
+			case MindmapPackage.THREAD_ITEM__ITEM_POST_DATE:
+				setItemPostDate((Object)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case MindmapPackage.THREAD_ITEM__AUTHOR:
+				setAuthor((Resource)null);
+				return;
+			case MindmapPackage.THREAD_ITEM__BODY:
+				setBody(BODY_EDEFAULT);
+				return;
+			case MindmapPackage.THREAD_ITEM__ITEM_POST_DATE:
+				setItemPostDate(ITEM_POST_DATE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case MindmapPackage.THREAD_ITEM__AUTHOR:
+				return author != null;
+			case MindmapPackage.THREAD_ITEM__BODY:
+				return BODY_EDEFAULT == null ? body != null : !BODY_EDEFAULT.equals(body);
+			case MindmapPackage.THREAD_ITEM__ITEM_POST_DATE:
+				return ITEM_POST_DATE_EDEFAULT == null ? itemPostDate != null : !ITEM_POST_DATE_EDEFAULT.equals(itemPostDate);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (body: ");
+		result.append(body);
+		result.append(", itemPostDate: ");
+		result.append(itemPostDate);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ThreadItemImpl
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/TopicImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/TopicImpl.java
new file mode 100644
index 000000000..3c9363acf
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/impl/TopicImpl.java
@@ -0,0 +1,676 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TopicImpl.java,v 1.1 2006/11/15 17:18:16 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Topic</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl#getComments <em>Comments</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl#getDuration <em>Duration</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl#getEndDate <em>End Date</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl#getPercentComplete <em>Percent Complete</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl#getPriority <em>Priority</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl#getResources <em>Resources</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl#getStartDate <em>Start Date</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl#getSubtopics <em>Subtopics</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class TopicImpl extends EObjectImpl implements Topic {
+	/**
+	 * The cached value of the '{@link #getComments() <em>Comments</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getComments()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList comments = null;
+
+	/**
+	 * The default value of the '{@link #getDuration() <em>Duration</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDuration()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final float DURATION_EDEFAULT = 0.0F;
+
+	/**
+	 * The cached value of the '{@link #getDuration() <em>Duration</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDuration()
+	 * @generated
+	 * @ordered
+	 */
+	protected float duration = DURATION_EDEFAULT;
+
+	/**
+	 * This is true if the Duration attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean durationESet = false;
+
+	/**
+	 * The default value of the '{@link #getEndDate() <em>End Date</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEndDate()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Object END_DATE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getEndDate() <em>End Date</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEndDate()
+	 * @generated
+	 * @ordered
+	 */
+	protected Object endDate = END_DATE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getPercentComplete() <em>Percent Complete</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPercentComplete()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final float PERCENT_COMPLETE_EDEFAULT = 0.0F;
+
+	/**
+	 * The cached value of the '{@link #getPercentComplete() <em>Percent Complete</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPercentComplete()
+	 * @generated
+	 * @ordered
+	 */
+	protected float percentComplete = PERCENT_COMPLETE_EDEFAULT;
+
+	/**
+	 * This is true if the Percent Complete attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean percentCompleteESet = false;
+
+	/**
+	 * The default value of the '{@link #getPriority() <em>Priority</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPriority()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Priority PRIORITY_EDEFAULT = Priority.ZERO_LITERAL;
+
+	/**
+	 * The cached value of the '{@link #getPriority() <em>Priority</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPriority()
+	 * @generated
+	 * @ordered
+	 */
+	protected Priority priority = PRIORITY_EDEFAULT;
+
+	/**
+	 * This is true if the Priority attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean priorityESet = false;
+
+	/**
+	 * The cached value of the '{@link #getResources() <em>Resources</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getResources()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList resources = null;
+
+	/**
+	 * The default value of the '{@link #getStartDate() <em>Start Date</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStartDate()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Object START_DATE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getStartDate() <em>Start Date</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStartDate()
+	 * @generated
+	 * @ordered
+	 */
+	protected Object startDate = START_DATE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getSubtopics() <em>Subtopics</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSubtopics()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList subtopics = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TopicImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return MindmapPackage.Literals.TOPIC;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getComments() {
+		if (comments == null) {
+			comments = new EObjectContainmentEList(org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread.class, this, MindmapPackage.TOPIC__COMMENTS);
+		}
+		return comments;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public float getDuration() {
+		return duration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDuration(float newDuration) {
+		float oldDuration = duration;
+		duration = newDuration;
+		boolean oldDurationESet = durationESet;
+		durationESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.TOPIC__DURATION, oldDuration, duration, !oldDurationESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetDuration() {
+		float oldDuration = duration;
+		boolean oldDurationESet = durationESet;
+		duration = DURATION_EDEFAULT;
+		durationESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, MindmapPackage.TOPIC__DURATION, oldDuration, DURATION_EDEFAULT, oldDurationESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetDuration() {
+		return durationESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getEndDate() {
+		return endDate;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setEndDate(Object newEndDate) {
+		Object oldEndDate = endDate;
+		endDate = newEndDate;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.TOPIC__END_DATE, oldEndDate, endDate));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.TOPIC__NAME, oldName, name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public float getPercentComplete() {
+		return percentComplete;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPercentComplete(float newPercentComplete) {
+		float oldPercentComplete = percentComplete;
+		percentComplete = newPercentComplete;
+		boolean oldPercentCompleteESet = percentCompleteESet;
+		percentCompleteESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.TOPIC__PERCENT_COMPLETE, oldPercentComplete, percentComplete, !oldPercentCompleteESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetPercentComplete() {
+		float oldPercentComplete = percentComplete;
+		boolean oldPercentCompleteESet = percentCompleteESet;
+		percentComplete = PERCENT_COMPLETE_EDEFAULT;
+		percentCompleteESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, MindmapPackage.TOPIC__PERCENT_COMPLETE, oldPercentComplete, PERCENT_COMPLETE_EDEFAULT, oldPercentCompleteESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetPercentComplete() {
+		return percentCompleteESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Priority getPriority() {
+		return priority;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPriority(Priority newPriority) {
+		Priority oldPriority = priority;
+		priority = newPriority == null ? PRIORITY_EDEFAULT : newPriority;
+		boolean oldPriorityESet = priorityESet;
+		priorityESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.TOPIC__PRIORITY, oldPriority, priority, !oldPriorityESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetPriority() {
+		Priority oldPriority = priority;
+		boolean oldPriorityESet = priorityESet;
+		priority = PRIORITY_EDEFAULT;
+		priorityESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, MindmapPackage.TOPIC__PRIORITY, oldPriority, PRIORITY_EDEFAULT, oldPriorityESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetPriority() {
+		return priorityESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getResources() {
+		if (resources == null) {
+			resources = new EObjectWithInverseResolvingEList.ManyInverse(Resource.class, this, MindmapPackage.TOPIC__RESOURCES, MindmapPackage.RESOURCE__TOPICS);
+		}
+		return resources;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getStartDate() {
+		return startDate;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStartDate(Object newStartDate) {
+		Object oldStartDate = startDate;
+		startDate = newStartDate;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MindmapPackage.TOPIC__START_DATE, oldStartDate, startDate));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getSubtopics() {
+		if (subtopics == null) {
+			subtopics = new EObjectResolvingEList(Topic.class, this, MindmapPackage.TOPIC__SUBTOPICS);
+		}
+		return subtopics;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case MindmapPackage.TOPIC__RESOURCES:
+				return ((InternalEList)getResources()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case MindmapPackage.TOPIC__COMMENTS:
+				return ((InternalEList)getComments()).basicRemove(otherEnd, msgs);
+			case MindmapPackage.TOPIC__RESOURCES:
+				return ((InternalEList)getResources()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case MindmapPackage.TOPIC__COMMENTS:
+				return getComments();
+			case MindmapPackage.TOPIC__DURATION:
+				return new Float(getDuration());
+			case MindmapPackage.TOPIC__END_DATE:
+				return getEndDate();
+			case MindmapPackage.TOPIC__NAME:
+				return getName();
+			case MindmapPackage.TOPIC__PERCENT_COMPLETE:
+				return new Float(getPercentComplete());
+			case MindmapPackage.TOPIC__PRIORITY:
+				return getPriority();
+			case MindmapPackage.TOPIC__RESOURCES:
+				return getResources();
+			case MindmapPackage.TOPIC__START_DATE:
+				return getStartDate();
+			case MindmapPackage.TOPIC__SUBTOPICS:
+				return getSubtopics();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case MindmapPackage.TOPIC__COMMENTS:
+				getComments().clear();
+				getComments().addAll((Collection)newValue);
+				return;
+			case MindmapPackage.TOPIC__DURATION:
+				setDuration(((Float)newValue).floatValue());
+				return;
+			case MindmapPackage.TOPIC__END_DATE:
+				setEndDate((Object)newValue);
+				return;
+			case MindmapPackage.TOPIC__NAME:
+				setName((String)newValue);
+				return;
+			case MindmapPackage.TOPIC__PERCENT_COMPLETE:
+				setPercentComplete(((Float)newValue).floatValue());
+				return;
+			case MindmapPackage.TOPIC__PRIORITY:
+				setPriority((Priority)newValue);
+				return;
+			case MindmapPackage.TOPIC__RESOURCES:
+				getResources().clear();
+				getResources().addAll((Collection)newValue);
+				return;
+			case MindmapPackage.TOPIC__START_DATE:
+				setStartDate((Object)newValue);
+				return;
+			case MindmapPackage.TOPIC__SUBTOPICS:
+				getSubtopics().clear();
+				getSubtopics().addAll((Collection)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case MindmapPackage.TOPIC__COMMENTS:
+				getComments().clear();
+				return;
+			case MindmapPackage.TOPIC__DURATION:
+				unsetDuration();
+				return;
+			case MindmapPackage.TOPIC__END_DATE:
+				setEndDate(END_DATE_EDEFAULT);
+				return;
+			case MindmapPackage.TOPIC__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case MindmapPackage.TOPIC__PERCENT_COMPLETE:
+				unsetPercentComplete();
+				return;
+			case MindmapPackage.TOPIC__PRIORITY:
+				unsetPriority();
+				return;
+			case MindmapPackage.TOPIC__RESOURCES:
+				getResources().clear();
+				return;
+			case MindmapPackage.TOPIC__START_DATE:
+				setStartDate(START_DATE_EDEFAULT);
+				return;
+			case MindmapPackage.TOPIC__SUBTOPICS:
+				getSubtopics().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case MindmapPackage.TOPIC__COMMENTS:
+				return comments != null && !comments.isEmpty();
+			case MindmapPackage.TOPIC__DURATION:
+				return isSetDuration();
+			case MindmapPackage.TOPIC__END_DATE:
+				return END_DATE_EDEFAULT == null ? endDate != null : !END_DATE_EDEFAULT.equals(endDate);
+			case MindmapPackage.TOPIC__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case MindmapPackage.TOPIC__PERCENT_COMPLETE:
+				return isSetPercentComplete();
+			case MindmapPackage.TOPIC__PRIORITY:
+				return isSetPriority();
+			case MindmapPackage.TOPIC__RESOURCES:
+				return resources != null && !resources.isEmpty();
+			case MindmapPackage.TOPIC__START_DATE:
+				return START_DATE_EDEFAULT == null ? startDate != null : !START_DATE_EDEFAULT.equals(startDate);
+			case MindmapPackage.TOPIC__SUBTOPICS:
+				return subtopics != null && !subtopics.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (duration: ");
+		if (durationESet) result.append(duration); else result.append("<unset>");
+		result.append(", endDate: ");
+		result.append(endDate);
+		result.append(", name: ");
+		result.append(name);
+		result.append(", percentComplete: ");
+		if (percentCompleteESet) result.append(percentComplete); else result.append("<unset>");
+		result.append(", priority: ");
+		if (priorityESet) result.append(priority); else result.append("<unset>");
+		result.append(", startDate: ");
+		result.append(startDate);
+		result.append(')');
+		return result.toString();
+	}
+
+} //TopicImpl
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/model/mindmap.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/model/mindmap.ecore
new file mode 100644
index 000000000..182fe4ff2
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/model/mindmap.ecore
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mindmap"
+    nsURI="http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap" nsPrefix="mindmap">
+  <eClassifiers xsi:type="ecore:EClass" name="DocumentRoot">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value=""/>
+      <details key="kind" value="mixed"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mixed" unique="false" upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="elementWildcard"/>
+        <details key="name" value=":mixed"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="xMLNSPrefixMap" upperBound="-1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
+        transient="true" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="xmlns:prefix"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="xSISchemaLocation" upperBound="-1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
+        transient="true" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="xsi:schemaLocation"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="map" upperBound="-2" eType="#//Map"
+        volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="map"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Map">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="Map"/>
+      <details key="kind" value="elementOnly"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="rootTopics" upperBound="-1"
+        eType="#//Topic" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="rootTopics"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="relations" upperBound="-1"
+        eType="#//Relationship" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="relations"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="resources" upperBound="-1"
+        eType="#//Resource" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="resources"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="title"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Priority">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="Priority"/>
+    </eAnnotations>
+    <eLiterals name="ZERO"/>
+    <eLiterals name="ONE" value="1"/>
+    <eLiterals name="TWO" value="2"/>
+    <eLiterals name="THREE" value="3"/>
+    <eLiterals name="FOUR" value="4"/>
+    <eLiterals name="FIVE" value="5"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="PriorityObject" instanceClassName="org.eclipse.emf.common.util.Enumerator">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="Priority:Object"/>
+      <details key="baseType" value="Priority"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Relationship">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="Relationship"/>
+      <details key="kind" value="empty"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="label"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="source" eType="#//Topic">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="source"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//Topic">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="target"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" eType="#//RelationshipType"
+        defaultValueLiteral="DEPENDENCY" unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="type"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="RelationshipType">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="RelationshipType"/>
+    </eAnnotations>
+    <eLiterals name="DEPENDENCY"/>
+    <eLiterals name="INCLUDES" value="1"/>
+    <eLiterals name="EXTENDS" value="2"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="RelationshipTypeObject" instanceClassName="org.eclipse.emf.common.util.Enumerator">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="RelationshipType:Object"/>
+      <details key="baseType" value="RelationshipType"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Resource">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="Resource"/>
+      <details key="kind" value="empty"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="comments" upperBound="-1"
+        eType="#//Thread" eOpposite="#//Thread/author">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="comments"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="email" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="email"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="name"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="topics" upperBound="-1"
+        eType="#//Topic" eOpposite="#//Topic/resources">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="topics"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Thread">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="Thread"/>
+      <details key="kind" value="elementOnly"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="items" upperBound="-1"
+        eType="#//ThreadItem" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="items"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="author" eType="#//Resource"
+        eOpposite="#//Resource/comments">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="author"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="postDate" unique="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Date">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="postDate"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="subject" unique="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="subject"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ThreadItem">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="ThreadItem"/>
+      <details key="kind" value="empty"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="author" eType="#//Resource">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="author"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="body"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="itemPostDate" unique="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Date">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="itemPostDate"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Topic">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="Topic"/>
+      <details key="kind" value="elementOnly"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="comments" upperBound="-1"
+        eType="#//Thread" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="comments"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="duration" unique="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" defaultValueLiteral="0"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="duration"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="endDate" unique="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Date">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="endDate"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="name"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentComplete" unique="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="percentComplete"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="priority" unique="false"
+        eType="#//Priority" defaultValueLiteral="ZERO" unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="priority"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="resources" upperBound="-1"
+        eType="#//Resource" eOpposite="#//Resource/topics">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="resources"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="startDate" unique="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Date">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="startDate"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="subtopics" upperBound="-1"
+        eType="#//Topic">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="subtopics"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/model/mindmap.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/model/mindmap.genmodel
new file mode 100644
index 000000000..29dd67914
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/model/mindmap.genmodel
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src"
+    modelPluginID="org.eclipse.emf.teneo.samples" modelName="Mindmap" importerID="org.eclipse.emf.importer.ecore">
+  <foreignModel>mindmap.ecore</foreignModel>
+  <genPackages prefix="Mindmap" resource="XML" basePackage="org.eclipse.emf.teneo.samples.emf.sample" disposableProviderFactory="true" ecorePackage="mindmap.ecore#/">
+    <genEnums ecoreEnum="mindmap.ecore#//Priority">
+      <genEnumLiterals ecoreEnumLiteral="mindmap.ecore#//Priority/ZERO"/>
+      <genEnumLiterals ecoreEnumLiteral="mindmap.ecore#//Priority/ONE"/>
+      <genEnumLiterals ecoreEnumLiteral="mindmap.ecore#//Priority/TWO"/>
+      <genEnumLiterals ecoreEnumLiteral="mindmap.ecore#//Priority/THREE"/>
+      <genEnumLiterals ecoreEnumLiteral="mindmap.ecore#//Priority/FOUR"/>
+      <genEnumLiterals ecoreEnumLiteral="mindmap.ecore#//Priority/FIVE"/>
+    </genEnums>
+    <genEnums ecoreEnum="mindmap.ecore#//RelationshipType">
+      <genEnumLiterals ecoreEnumLiteral="mindmap.ecore#//RelationshipType/DEPENDENCY"/>
+      <genEnumLiterals ecoreEnumLiteral="mindmap.ecore#//RelationshipType/INCLUDES"/>
+      <genEnumLiterals ecoreEnumLiteral="mindmap.ecore#//RelationshipType/EXTENDS"/>
+    </genEnums>
+    <genDataTypes ecoreDataType="mindmap.ecore#//PriorityObject"/>
+    <genDataTypes ecoreDataType="mindmap.ecore#//RelationshipTypeObject"/>
+    <genClasses ecoreClass="mindmap.ecore#//DocumentRoot">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute mindmap.ecore#//DocumentRoot/mixed"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference mindmap.ecore#//DocumentRoot/xMLNSPrefixMap"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference mindmap.ecore#//DocumentRoot/xSISchemaLocation"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference mindmap.ecore#//DocumentRoot/map"/>
+    </genClasses>
+    <genClasses ecoreClass="mindmap.ecore#//Map">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference mindmap.ecore#//Map/rootTopics"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference mindmap.ecore#//Map/relations"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference mindmap.ecore#//Map/resources"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mindmap.ecore#//Map/title"/>
+    </genClasses>
+    <genClasses ecoreClass="mindmap.ecore#//Relationship">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mindmap.ecore#//Relationship/label"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference mindmap.ecore#//Relationship/source"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference mindmap.ecore#//Relationship/target"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mindmap.ecore#//Relationship/type"/>
+    </genClasses>
+    <genClasses ecoreClass="mindmap.ecore#//Resource">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference mindmap.ecore#//Resource/comments"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mindmap.ecore#//Resource/email"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mindmap.ecore#//Resource/name"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference mindmap.ecore#//Resource/topics"/>
+    </genClasses>
+    <genClasses ecoreClass="mindmap.ecore#//Thread">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference mindmap.ecore#//Thread/items"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference mindmap.ecore#//Thread/author"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mindmap.ecore#//Thread/postDate"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mindmap.ecore#//Thread/subject"/>
+    </genClasses>
+    <genClasses ecoreClass="mindmap.ecore#//ThreadItem">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference mindmap.ecore#//ThreadItem/author"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mindmap.ecore#//ThreadItem/body"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mindmap.ecore#//ThreadItem/itemPostDate"/>
+    </genClasses>
+    <genClasses ecoreClass="mindmap.ecore#//Topic">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference mindmap.ecore#//Topic/comments"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mindmap.ecore#//Topic/duration"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mindmap.ecore#//Topic/endDate"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mindmap.ecore#//Topic/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mindmap.ecore#//Topic/percentComplete"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mindmap.ecore#//Topic/priority"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference mindmap.ecore#//Topic/resources"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mindmap.ecore#//Topic/startDate"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference mindmap.ecore#//Topic/subtopics"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/util/MindmapAdapterFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/util/MindmapAdapterFactory.java
new file mode 100644
index 000000000..2404b82c5
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/util/MindmapAdapterFactory.java
@@ -0,0 +1,228 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: MindmapAdapterFactory.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage
+ * @generated
+ */
+public class MindmapAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static MindmapPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public MindmapAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = MindmapPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch the delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MindmapSwitch modelSwitch =
+		new MindmapSwitch() {
+			public Object caseDocumentRoot(DocumentRoot object) {
+				return createDocumentRootAdapter();
+			}
+			public Object caseMap(Map object) {
+				return createMapAdapter();
+			}
+			public Object caseRelationship(Relationship object) {
+				return createRelationshipAdapter();
+			}
+			public Object caseResource(Resource object) {
+				return createResourceAdapter();
+			}
+			public Object caseThread(org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread object) {
+				return createThreadAdapter();
+			}
+			public Object caseThreadItem(ThreadItem object) {
+				return createThreadItemAdapter();
+			}
+			public Object caseTopic(Topic object) {
+				return createTopicAdapter();
+			}
+			public Object defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	public Adapter createAdapter(Notifier target) {
+		return (Adapter)modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot <em>Document Root</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot
+	 * @generated
+	 */
+	public Adapter createDocumentRootAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map <em>Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map
+	 * @generated
+	 */
+	public Adapter createMapAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship <em>Relationship</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship
+	 * @generated
+	 */
+	public Adapter createRelationshipAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource <em>Resource</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource
+	 * @generated
+	 */
+	public Adapter createResourceAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread <em>Thread</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread
+	 * @generated
+	 */
+	public Adapter createThreadAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem <em>Thread Item</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem
+	 * @generated
+	 */
+	public Adapter createThreadItemAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic <em>Topic</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic
+	 * @generated
+	 */
+	public Adapter createTopicAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //MindmapAdapterFactory
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/util/MindmapResourceFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/util/MindmapResourceFactoryImpl.java
new file mode 100644
index 000000000..256c2ec6a
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/util/MindmapResourceFactoryImpl.java
@@ -0,0 +1,55 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: MindmapResourceFactoryImpl.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap.util;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.resource.Resource;
+
+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
+
+import org.eclipse.emf.ecore.xmi.XMLResource;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource Factory</b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.util.MindmapResourceImpl
+ * @generated
+ */
+public class MindmapResourceFactoryImpl extends ResourceFactoryImpl {
+	/**
+	 * Creates an instance of the resource factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public MindmapResourceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Resource createResource(URI uri) {
+		XMLResource result = new MindmapResourceImpl(uri);
+		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
+		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
+
+		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
+
+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
+		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
+
+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
+		return result;
+	}
+
+} //MindmapResourceFactoryImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/util/MindmapResourceImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/util/MindmapResourceImpl.java
new file mode 100644
index 000000000..c34f71ab4
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/util/MindmapResourceImpl.java
@@ -0,0 +1,32 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: MindmapResourceImpl.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap.util;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource </b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.util.MindmapResourceFactoryImpl
+ * @generated
+ */
+public class MindmapResourceImpl extends XMLResourceImpl {
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param uri the URI of the new resource.
+	 * @generated
+	 */
+	public MindmapResourceImpl(URI uri) {
+		super(uri);
+	}
+
+} //MindmapResourceImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/util/MindmapSwitch.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/util/MindmapSwitch.java
new file mode 100644
index 000000000..0ad8c8733
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/util/MindmapSwitch.java
@@ -0,0 +1,262 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: MindmapSwitch.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap.util;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.DocumentRoot;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage
+ * @generated
+ */
+public class MindmapSwitch {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static MindmapPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public MindmapSwitch() {
+		if (modelPackage == null) {
+			modelPackage = MindmapPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	public Object doSwitch(EObject theEObject) {
+		return doSwitch(theEObject.eClass(), theEObject);
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	protected Object doSwitch(EClass theEClass, EObject theEObject) {
+		if (theEClass.eContainer() == modelPackage) {
+			return doSwitch(theEClass.getClassifierID(), theEObject);
+		}
+		else {
+			List eSuperTypes = theEClass.getESuperTypes();
+			return
+				eSuperTypes.isEmpty() ?
+					defaultCase(theEObject) :
+					doSwitch((EClass)eSuperTypes.get(0), theEObject);
+		}
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	protected Object doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case MindmapPackage.DOCUMENT_ROOT: {
+				DocumentRoot documentRoot = (DocumentRoot)theEObject;
+				Object result = caseDocumentRoot(documentRoot);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case MindmapPackage.MAP: {
+				Map map = (Map)theEObject;
+				Object result = caseMap(map);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case MindmapPackage.RELATIONSHIP: {
+				Relationship relationship = (Relationship)theEObject;
+				Object result = caseRelationship(relationship);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case MindmapPackage.RESOURCE: {
+				Resource resource = (Resource)theEObject;
+				Object result = caseResource(resource);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case MindmapPackage.THREAD: {
+				org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread thread = (org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread)theEObject;
+				Object result = caseThread(thread);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case MindmapPackage.THREAD_ITEM: {
+				ThreadItem threadItem = (ThreadItem)theEObject;
+				Object result = caseThreadItem(threadItem);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case MindmapPackage.TOPIC: {
+				Topic topic = (Topic)theEObject;
+				Object result = caseTopic(topic);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Document Root</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Document Root</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseDocumentRoot(DocumentRoot object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Map</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Map</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseMap(Map object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Relationship</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Relationship</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseRelationship(Relationship object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Resource</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Resource</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseResource(Resource object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Thread</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Thread</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseThread(org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Thread Item</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Thread Item</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseThreadItem(ThreadItem object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Topic</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Topic</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseTopic(Topic object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	public Object defaultCase(EObject object) {
+		return null;
+	}
+
+} //MindmapSwitch
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/util/MindmapXMLProcessor.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/util/MindmapXMLProcessor.java
new file mode 100644
index 000000000..1c46f1e49
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/mindmap/util/MindmapXMLProcessor.java
@@ -0,0 +1,50 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: MindmapXMLProcessor.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.mindmap.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
+
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage;
+
+/**
+ * This class contains helper methods to serialize and deserialize XML documents
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class MindmapXMLProcessor extends XMLProcessor {
+	/**
+	 * Public constructor to instantiate the helper.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public MindmapXMLProcessor() {
+		super((EPackage.Registry.INSTANCE));
+		MindmapPackage.eINSTANCE.eClass();
+	}
+	
+	/**
+	 * Register for "*" and "xml" file extensions the MindmapResourceFactoryImpl factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map getRegistrations() {
+		if (registrations == null) {
+			super.getRegistrations();
+			registrations.put(XML_EXTENSION, new MindmapResourceFactoryImpl());
+			registrations.put(STAR_EXTENSION, new MindmapResourceFactoryImpl());
+		}
+		return registrations;
+	}
+
+} //MindmapXMLProcessor
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/ClassificationType.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/ClassificationType.java
new file mode 100644
index 000000000..3a8486733
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/ClassificationType.java
@@ -0,0 +1,84 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ClassificationType.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.product;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Classification Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.product.ClassificationType#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.sample.product.ProductPackage#getClassificationType()
+ * @model extendedMetaData="name='ProductType' kind='elementOnly'"
+ * @generated
+ */
+public interface ClassificationType extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * The default value is <code>""</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #isSetName()
+	 * @see #unsetName()
+	 * @see #setName(String)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.product.ProductPackage#getClassificationType_Name()
+	 * @model default="" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+	 *        extendedMetaData="kind='element' name='Code'"
+	 *        annotation="teneo.jpa appInfo='@Id'"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.product.ClassificationType#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #isSetName()
+	 * @see #unsetName()
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+	/**
+	 * Unsets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.product.ClassificationType#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetName()
+	 * @see #getName()
+	 * @see #setName(String)
+	 * @generated
+	 */
+	void unsetName();
+
+	/**
+	 * Returns whether the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.product.ClassificationType#getName <em>Name</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Name</em>' attribute is set.
+	 * @see #unsetName()
+	 * @see #getName()
+	 * @see #setName(String)
+	 * @generated
+	 */
+	boolean isSetName();
+
+} // ClassificationType
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/ProductFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/ProductFactory.java
index 26fda5dff..e53aa0f6c 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/ProductFactory.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/ProductFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ProductFactory.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: ProductFactory.java,v 1.2 2006/11/15 17:18:17 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.sample.product;
 
@@ -44,6 +44,15 @@ public interface ProductFactory extends EFactory {
 	SupplierType createSupplierType();
 
 	/**
+	 * Returns a new object of class '<em>Classification Type</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Classification Type</em>'.
+	 * @generated
+	 */
+	ClassificationType createClassificationType();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/ProductPackage.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/ProductPackage.java
index f5549c3bb..2d0756fdc 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/ProductPackage.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/ProductPackage.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ProductPackage.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: ProductPackage.java,v 1.2 2006/11/15 17:18:17 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.sample.product;
 
@@ -88,7 +88,7 @@ public interface ProductPackage extends EPackage {
 	int PRODUCT_TYPE__ID = 1;
 
 	/**
-	 * The feature id for the '<em><b>Supplier</b></em>' containment reference.
+	 * The feature id for the '<em><b>Supplier</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -115,13 +115,31 @@ public interface ProductPackage extends EPackage {
 	int PRODUCT_TYPE__CREATED_ON = 4;
 
 	/**
+	 * The feature id for the '<em><b>Any One</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PRODUCT_TYPE__ANY_ONE = 5;
+
+	/**
+	 * The feature id for the '<em><b>Any List</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PRODUCT_TYPE__ANY_LIST = 6;
+
+	/**
 	 * The number of structural features of the '<em>Type</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PRODUCT_TYPE_FEATURE_COUNT = 5;
+	int PRODUCT_TYPE_FEATURE_COUNT = 7;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.sample.product.impl.SupplierTypeImpl <em>Supplier Type</em>}' class.
@@ -162,6 +180,35 @@ public interface ProductPackage extends EPackage {
 
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.sample.product.impl.ClassificationTypeImpl <em>Classification Type</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.product.impl.ClassificationTypeImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductPackageImpl#getClassificationType()
+	 * @generated
+	 */
+	int CLASSIFICATION_TYPE = 2;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLASSIFICATION_TYPE__NAME = 0;
+
+	/**
+	 * The number of structural features of the '<em>Classification Type</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLASSIFICATION_TYPE_FEATURE_COUNT = 1;
+
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.sample.product.ProductType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -194,10 +241,10 @@ public interface ProductPackage extends EPackage {
 	EAttribute getProductType_Id();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.samples.emf.sample.product.ProductType#getSupplier <em>Supplier</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.samples.emf.sample.product.ProductType#getSupplier <em>Supplier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Supplier</em>'.
+	 * @return the meta object for the reference '<em>Supplier</em>'.
 	 * @see org.eclipse.emf.teneo.samples.emf.sample.product.ProductType#getSupplier()
 	 * @see #getProductType()
 	 * @generated
@@ -227,6 +274,28 @@ public interface ProductPackage extends EPackage {
 	EAttribute getProductType_CreatedOn();
 
 	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.samples.emf.sample.product.ProductType#getAnyOne <em>Any One</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Any One</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.product.ProductType#getAnyOne()
+	 * @see #getProductType()
+	 * @generated
+	 */
+	EReference getProductType_AnyOne();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.samples.emf.sample.product.ProductType#getAnyList <em>Any List</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Any List</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.product.ProductType#getAnyList()
+	 * @see #getProductType()
+	 * @generated
+	 */
+	EReference getProductType_AnyList();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.sample.product.SupplierType <em>Supplier Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -259,6 +328,27 @@ public interface ProductPackage extends EPackage {
 	EAttribute getSupplierType_NoOfEmployees();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.sample.product.ClassificationType <em>Classification Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Classification Type</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.product.ClassificationType
+	 * @generated
+	 */
+	EClass getClassificationType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.sample.product.ClassificationType#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.product.ClassificationType#getName()
+	 * @see #getClassificationType()
+	 * @generated
+	 */
+	EAttribute getClassificationType_Name();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -307,7 +397,7 @@ public interface ProductPackage extends EPackage {
 		EAttribute PRODUCT_TYPE__ID = eINSTANCE.getProductType_Id();
 
 		/**
-		 * The meta object literal for the '<em><b>Supplier</b></em>' containment reference feature.
+		 * The meta object literal for the '<em><b>Supplier</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
@@ -331,6 +421,22 @@ public interface ProductPackage extends EPackage {
 		EAttribute PRODUCT_TYPE__CREATED_ON = eINSTANCE.getProductType_CreatedOn();
 
 		/**
+		 * The meta object literal for the '<em><b>Any One</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PRODUCT_TYPE__ANY_ONE = eINSTANCE.getProductType_AnyOne();
+
+		/**
+		 * The meta object literal for the '<em><b>Any List</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PRODUCT_TYPE__ANY_LIST = eINSTANCE.getProductType_AnyList();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.sample.product.impl.SupplierTypeImpl <em>Supplier Type</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -356,6 +462,24 @@ public interface ProductPackage extends EPackage {
 		 */
 		EAttribute SUPPLIER_TYPE__NO_OF_EMPLOYEES = eINSTANCE.getSupplierType_NoOfEmployees();
 
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.sample.product.impl.ClassificationTypeImpl <em>Classification Type</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.product.impl.ClassificationTypeImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductPackageImpl#getClassificationType()
+		 * @generated
+		 */
+		EClass CLASSIFICATION_TYPE = eINSTANCE.getClassificationType();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CLASSIFICATION_TYPE__NAME = eINSTANCE.getClassificationType_Name();
+
 	}
 
 } //ProductPackage
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/ProductType.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/ProductType.java
index 79d391465..5b7b14a56 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/ProductType.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/ProductType.java
@@ -2,10 +2,12 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ProductType.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: ProductType.java,v 1.2 2006/11/15 17:18:17 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.sample.product;
 
+import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -21,6 +23,8 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.product.ProductType#getSupplier <em>Supplier</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.product.ProductType#getPrice <em>Price</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.product.ProductType#getCreatedOn <em>Created On</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.product.ProductType#getAnyOne <em>Any One</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.product.ProductType#getAnyList <em>Any List</em>}</li>
  * </ul>
  * </p>
  *
@@ -112,27 +116,27 @@ public interface ProductType extends EObject {
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Supplier</b></em>' containment reference.
+	 * Returns the value of the '<em><b>Supplier</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Supplier</em>' containment reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Supplier</em>' containment reference.
+	 * @return the value of the '<em>Supplier</em>' reference.
 	 * @see #setSupplier(SupplierType)
 	 * @see org.eclipse.emf.teneo.samples.emf.sample.product.ProductPackage#getProductType_Supplier()
-	 * @model containment="true" resolveProxies="false" required="true"
+	 * @model resolveProxies="false" required="true"
 	 *        extendedMetaData="kind='element' name='Supplier'"
 	 * @generated
 	 */
 	SupplierType getSupplier();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.product.ProductType#getSupplier <em>Supplier</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.product.ProductType#getSupplier <em>Supplier</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Supplier</em>' containment reference.
+	 * @param value the new value of the '<em>Supplier</em>' reference.
 	 * @see #getSupplier()
 	 * @generated
 	 */
@@ -219,4 +223,46 @@ public interface ProductType extends EObject {
 	 */
 	void setCreatedOn(Object value);
 
+	/**
+	 * Returns the value of the '<em><b>Any One</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Any One</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Any One</em>' reference.
+	 * @see #setAnyOne(EObject)
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.product.ProductPackage#getProductType_AnyOne()
+	 * @model
+	 * @generated
+	 */
+	EObject getAnyOne();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.sample.product.ProductType#getAnyOne <em>Any One</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Any One</em>' reference.
+	 * @see #getAnyOne()
+	 * @generated
+	 */
+	void setAnyOne(EObject value);
+
+	/**
+	 * Returns the value of the '<em><b>Any List</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Any List</em>' reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Any List</em>' containment reference list.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.product.ProductPackage#getProductType_AnyList()
+	 * @model type="org.eclipse.emf.ecore.EObject" containment="true"
+	 * @generated
+	 */
+	EList getAnyList();
+
 } // ProductType
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/impl/ClassificationTypeImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/impl/ClassificationTypeImpl.java
new file mode 100644
index 000000000..162c813e2
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/impl/ClassificationTypeImpl.java
@@ -0,0 +1,195 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ClassificationTypeImpl.java,v 1.1 2006/11/15 17:18:17 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.sample.product.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.teneo.samples.emf.sample.product.ClassificationType;
+import org.eclipse.emf.teneo.samples.emf.sample.product.ProductPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Classification Type</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.product.impl.ClassificationTypeImpl#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ClassificationTypeImpl extends EObjectImpl implements ClassificationType {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = "";
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * This is true if the Name attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean nameESet = false;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ClassificationTypeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return ProductPackage.Literals.CLASSIFICATION_TYPE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		boolean oldNameESet = nameESet;
+		nameESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ProductPackage.CLASSIFICATION_TYPE__NAME, oldName, name, !oldNameESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetName() {
+		String oldName = name;
+		boolean oldNameESet = nameESet;
+		name = NAME_EDEFAULT;
+		nameESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, ProductPackage.CLASSIFICATION_TYPE__NAME, oldName, NAME_EDEFAULT, oldNameESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetName() {
+		return nameESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ProductPackage.CLASSIFICATION_TYPE__NAME:
+				return getName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ProductPackage.CLASSIFICATION_TYPE__NAME:
+				setName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ProductPackage.CLASSIFICATION_TYPE__NAME:
+				unsetName();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ProductPackage.CLASSIFICATION_TYPE__NAME:
+				return isSetName();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		if (nameESet) result.append(name); else result.append("<unset>");
+		result.append(')');
+		return result.toString();
+	}
+
+} //ClassificationTypeImpl
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/impl/ProductFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/impl/ProductFactoryImpl.java
index ec001d502..261c21b5e 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/impl/ProductFactoryImpl.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/impl/ProductFactoryImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ProductFactoryImpl.java,v 1.2 2006/07/22 13:01:18 mtaal Exp $
+ * $Id: ProductFactoryImpl.java,v 1.3 2006/11/15 17:18:17 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.sample.product.impl;
 
@@ -11,6 +11,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.emf.teneo.samples.emf.sample.product.*;
+
 import org.eclipse.emf.teneo.samples.emf.sample.product.ProductFactory;
 import org.eclipse.emf.teneo.samples.emf.sample.product.ProductPackage;
 import org.eclipse.emf.teneo.samples.emf.sample.product.ProductType;
@@ -61,6 +63,7 @@ public class ProductFactoryImpl extends EFactoryImpl implements ProductFactory {
 		switch (eClass.getClassifierID()) {
 			case ProductPackage.PRODUCT_TYPE: return createProductType();
 			case ProductPackage.SUPPLIER_TYPE: return createSupplierType();
+			case ProductPackage.CLASSIFICATION_TYPE: return createClassificationType();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -91,6 +94,16 @@ public class ProductFactoryImpl extends EFactoryImpl implements ProductFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public ClassificationType createClassificationType() {
+		ClassificationTypeImpl classificationType = new ClassificationTypeImpl();
+		return classificationType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public ProductPackage getProductPackage() {
 		return (ProductPackage)getEPackage();
 	}
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/impl/ProductPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/impl/ProductPackageImpl.java
index a9a04bbc3..9c4884743 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/impl/ProductPackageImpl.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/impl/ProductPackageImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ProductPackageImpl.java,v 1.2 2006/07/22 13:01:18 mtaal Exp $
+ * $Id: ProductPackageImpl.java,v 1.3 2006/11/15 17:18:17 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.sample.product.impl;
 
@@ -12,6 +12,7 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
+import org.eclipse.emf.teneo.samples.emf.sample.product.ClassificationType;
 import org.eclipse.emf.teneo.samples.emf.sample.product.ProductFactory;
 import org.eclipse.emf.teneo.samples.emf.sample.product.ProductPackage;
 import org.eclipse.emf.teneo.samples.emf.sample.product.ProductType;
@@ -39,6 +40,13 @@ public class ProductPackageImpl extends EPackageImpl implements ProductPackage {
 	private EClass supplierTypeEClass = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass classificationTypeEClass = null;
+
+	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
 	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
@@ -168,6 +176,24 @@ public class ProductPackageImpl extends EPackageImpl implements ProductPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getProductType_AnyOne() {
+		return (EReference)productTypeEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getProductType_AnyList() {
+		return (EReference)productTypeEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getSupplierType() {
 		return supplierTypeEClass;
 	}
@@ -195,6 +221,24 @@ public class ProductPackageImpl extends EPackageImpl implements ProductPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getClassificationType() {
+		return classificationTypeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getClassificationType_Name() {
+		return (EAttribute)classificationTypeEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public ProductFactory getProductFactory() {
 		return (ProductFactory)getEFactoryInstance();
 	}
@@ -224,10 +268,15 @@ public class ProductPackageImpl extends EPackageImpl implements ProductPackage {
 		createEReference(productTypeEClass, PRODUCT_TYPE__SUPPLIER);
 		createEAttribute(productTypeEClass, PRODUCT_TYPE__PRICE);
 		createEAttribute(productTypeEClass, PRODUCT_TYPE__CREATED_ON);
+		createEReference(productTypeEClass, PRODUCT_TYPE__ANY_ONE);
+		createEReference(productTypeEClass, PRODUCT_TYPE__ANY_LIST);
 
 		supplierTypeEClass = createEClass(SUPPLIER_TYPE);
 		createEAttribute(supplierTypeEClass, SUPPLIER_TYPE__NAME);
 		createEAttribute(supplierTypeEClass, SUPPLIER_TYPE__NO_OF_EMPLOYEES);
+
+		classificationTypeEClass = createEClass(CLASSIFICATION_TYPE);
+		createEAttribute(classificationTypeEClass, CLASSIFICATION_TYPE__NAME);
 	}
 
 	/**
@@ -262,20 +311,27 @@ public class ProductPackageImpl extends EPackageImpl implements ProductPackage {
 		initEClass(productTypeEClass, ProductType.class, "ProductType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getProductType_Code(), theXMLTypePackage.getString(), "code", "c1", 1, 1, ProductType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getProductType_Id(), theXMLTypePackage.getID(), "id", null, 1, 1, ProductType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getProductType_Supplier(), this.getSupplierType(), null, "supplier", null, 1, 1, ProductType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getProductType_Supplier(), this.getSupplierType(), null, "supplier", null, 1, 1, ProductType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getProductType_Price(), theXMLTypePackage.getDouble(), "price", null, 1, 1, ProductType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getProductType_CreatedOn(), theXMLTypePackage.getDate(), "createdOn", null, 1, 1, ProductType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getProductType_AnyOne(), ecorePackage.getEObject(), null, "AnyOne", null, 0, 1, ProductType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getProductType_AnyList(), ecorePackage.getEObject(), null, "AnyList", null, 0, -1, ProductType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(supplierTypeEClass, SupplierType.class, "SupplierType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getSupplierType_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, SupplierType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getSupplierType_NoOfEmployees(), theXMLTypePackage.getInt(), "noOfEmployees", null, 1, 1, SupplierType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(classificationTypeEClass, ClassificationType.class, "ClassificationType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getClassificationType_Name(), theXMLTypePackage.getString(), "name", "", 1, 1, ClassificationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		// Create resource
 		createResource(eNS_URI);
 
 		// Create annotations
 		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
 		createExtendedMetaDataAnnotations();
+		// teneo.jpa
+		createTeneoAnnotations();
 	}
 
 	/**
@@ -348,6 +404,36 @@ public class ProductPackageImpl extends EPackageImpl implements ProductPackage {
 		   new String[] {
 			 "kind", "element",
 			 "name", "NoOfEmployees"
+		   });		
+		addAnnotation
+		  (classificationTypeEClass, 
+		   source, 
+		   new String[] {
+			 "name", "ProductType",
+			 "kind", "elementOnly"
+		   });		
+		addAnnotation
+		  (getClassificationType_Name(), 
+		   source, 
+		   new String[] {
+			 "kind", "element",
+			 "name", "Code"
+		   });	
+	}
+
+	/**
+	 * Initializes the annotations for <b>teneo.jpa</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createTeneoAnnotations() {
+		String source = "teneo.jpa";													
+		addAnnotation
+		  (getClassificationType_Name(), 
+		   source, 
+		   new String[] {
+			 "appInfo", "@Id"
 		   });
 	}
 
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/impl/ProductTypeImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/impl/ProductTypeImpl.java
index 012022563..28ee4e30e 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/impl/ProductTypeImpl.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/impl/ProductTypeImpl.java
@@ -2,16 +2,26 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ProductTypeImpl.java,v 1.2 2006/07/22 13:01:18 mtaal Exp $
+ * $Id: ProductTypeImpl.java,v 1.3 2006/11/15 17:18:17 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.sample.product.impl;
 
+import java.util.Collection;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
 import org.eclipse.emf.teneo.samples.emf.sample.product.ProductPackage;
 import org.eclipse.emf.teneo.samples.emf.sample.product.ProductType;
 import org.eclipse.emf.teneo.samples.emf.sample.product.SupplierType;
@@ -28,6 +38,8 @@ import org.eclipse.emf.teneo.samples.emf.sample.product.SupplierType;
  *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl#getSupplier <em>Supplier</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl#getPrice <em>Price</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl#getCreatedOn <em>Created On</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl#getAnyOne <em>Any One</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl#getAnyList <em>Any List</em>}</li>
  * </ul>
  * </p>
  *
@@ -84,7 +96,7 @@ public class ProductTypeImpl extends EObjectImpl implements ProductType {
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getSupplier() <em>Supplier</em>}' containment reference.
+	 * The cached value of the '{@link #getSupplier() <em>Supplier</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see #getSupplier()
@@ -143,6 +155,26 @@ public class ProductTypeImpl extends EObjectImpl implements ProductType {
 	protected Object createdOn = CREATED_ON_EDEFAULT;
 
 	/**
+	 * The cached value of the '{@link #getAnyOne() <em>Any One</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAnyOne()
+	 * @generated
+	 * @ordered
+	 */
+	protected EObject anyOne = null;
+
+	/**
+	 * The cached value of the '{@link #getAnyList() <em>Any List</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAnyList()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList anyList = null;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -241,33 +273,11 @@ public class ProductTypeImpl extends EObjectImpl implements ProductType {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetSupplier(SupplierType newSupplier, NotificationChain msgs) {
+	public void setSupplier(SupplierType newSupplier) {
 		SupplierType oldSupplier = supplier;
 		supplier = newSupplier;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ProductPackage.PRODUCT_TYPE__SUPPLIER, oldSupplier, newSupplier);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSupplier(SupplierType newSupplier) {
-		if (newSupplier != supplier) {
-			NotificationChain msgs = null;
-			if (supplier != null)
-				msgs = ((InternalEObject)supplier).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ProductPackage.PRODUCT_TYPE__SUPPLIER, null, msgs);
-			if (newSupplier != null)
-				msgs = ((InternalEObject)newSupplier).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ProductPackage.PRODUCT_TYPE__SUPPLIER, null, msgs);
-			msgs = basicSetSupplier(newSupplier, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ProductPackage.PRODUCT_TYPE__SUPPLIER, newSupplier, newSupplier));
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ProductPackage.PRODUCT_TYPE__SUPPLIER, oldSupplier, supplier));
 	}
 
 	/**
@@ -342,10 +352,60 @@ public class ProductTypeImpl extends EObjectImpl implements ProductType {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EObject getAnyOne() {
+		if (anyOne != null && anyOne.eIsProxy()) {
+			InternalEObject oldAnyOne = (InternalEObject)anyOne;
+			anyOne = eResolveProxy(oldAnyOne);
+			if (anyOne != oldAnyOne) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ProductPackage.PRODUCT_TYPE__ANY_ONE, oldAnyOne, anyOne));
+			}
+		}
+		return anyOne;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject basicGetAnyOne() {
+		return anyOne;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAnyOne(EObject newAnyOne) {
+		EObject oldAnyOne = anyOne;
+		anyOne = newAnyOne;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ProductPackage.PRODUCT_TYPE__ANY_ONE, oldAnyOne, anyOne));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getAnyList() {
+		if (anyList == null) {
+			anyList = new EObjectContainmentEList(EObject.class, this, ProductPackage.PRODUCT_TYPE__ANY_LIST);
+		}
+		return anyList;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ProductPackage.PRODUCT_TYPE__SUPPLIER:
-				return basicSetSupplier(null, msgs);
+			case ProductPackage.PRODUCT_TYPE__ANY_LIST:
+				return ((InternalEList)getAnyList()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -367,6 +427,11 @@ public class ProductTypeImpl extends EObjectImpl implements ProductType {
 				return new Double(getPrice());
 			case ProductPackage.PRODUCT_TYPE__CREATED_ON:
 				return getCreatedOn();
+			case ProductPackage.PRODUCT_TYPE__ANY_ONE:
+				if (resolve) return getAnyOne();
+				return basicGetAnyOne();
+			case ProductPackage.PRODUCT_TYPE__ANY_LIST:
+				return getAnyList();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -393,6 +458,13 @@ public class ProductTypeImpl extends EObjectImpl implements ProductType {
 			case ProductPackage.PRODUCT_TYPE__CREATED_ON:
 				setCreatedOn((Object)newValue);
 				return;
+			case ProductPackage.PRODUCT_TYPE__ANY_ONE:
+				setAnyOne((EObject)newValue);
+				return;
+			case ProductPackage.PRODUCT_TYPE__ANY_LIST:
+				getAnyList().clear();
+				getAnyList().addAll((Collection)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -419,6 +491,12 @@ public class ProductTypeImpl extends EObjectImpl implements ProductType {
 			case ProductPackage.PRODUCT_TYPE__CREATED_ON:
 				setCreatedOn(CREATED_ON_EDEFAULT);
 				return;
+			case ProductPackage.PRODUCT_TYPE__ANY_ONE:
+				setAnyOne((EObject)null);
+				return;
+			case ProductPackage.PRODUCT_TYPE__ANY_LIST:
+				getAnyList().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -440,6 +518,10 @@ public class ProductTypeImpl extends EObjectImpl implements ProductType {
 				return isSetPrice();
 			case ProductPackage.PRODUCT_TYPE__CREATED_ON:
 				return CREATED_ON_EDEFAULT == null ? createdOn != null : !CREATED_ON_EDEFAULT.equals(createdOn);
+			case ProductPackage.PRODUCT_TYPE__ANY_ONE:
+				return anyOne != null;
+			case ProductPackage.PRODUCT_TYPE__ANY_LIST:
+				return anyList != null && !anyList.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/model/product.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/model/product.ecore
index efe56507d..f66ced1fb 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/model/product.ecore
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/model/product.ecore
@@ -24,7 +24,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="supplier" lowerBound="1"
-        eType="#//SupplierType" containment="true" resolveProxies="false">
+        eType="#//SupplierType" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="element"/>
         <details key="name" value="Supplier"/>
@@ -44,6 +44,9 @@
         <details key="name" value="CreatedOn"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="AnyOne" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="AnyList" upperBound="-1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SupplierType">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -66,4 +69,21 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ClassificationType">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="ProductType"/>
+      <details key="kind" value="elementOnly"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String" defaultValueLiteral=""
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="Code"/>
+      </eAnnotations>
+      <eAnnotations source="teneo.jpa">
+        <details key="appInfo" value="@Id"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/model/product.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/model/product.genmodel
index 5acd7efe6..c8c230bc6 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/model/product.genmodel
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/model/product.genmodel
@@ -2,20 +2,25 @@
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src"
-    modelPluginID="org.eclipse.emf.teneo.samples" modelName="Product" importerID="org.eclipse.xsd.ecore.importer">
-  <foreignModel>product.xsd</foreignModel>
-  <genPackages prefix="Product" basePackage="org.eclipse.emf.teneo.samples.emf.sample" resource="XML"
-      disposableProviderFactory="true" ecorePackage="product.ecore#/">
+    modelPluginID="org.eclipse.emf.teneo.samples" modelName="Product" importerID="org.eclipse.emf.importer.ecore">
+  <foreignModel>product.ecore</foreignModel>
+  <genPackages prefix="Product" basePackage="org.eclipse.emf.teneo.samples.emf.sample"
+      resource="XML" disposableProviderFactory="true" ecorePackage="product.ecore#/">
     <genClasses ecoreClass="product.ecore#//ProductType">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute product.ecore#//ProductType/code"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute product.ecore#//ProductType/id"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference product.ecore#//ProductType/supplier"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute product.ecore#//ProductType/price"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute product.ecore#//ProductType/createdOn"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference product.ecore#//ProductType/AnyOne"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference product.ecore#//ProductType/AnyList"/>
     </genClasses>
     <genClasses ecoreClass="product.ecore#//SupplierType">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute product.ecore#//SupplierType/name"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute product.ecore#//SupplierType/noOfEmployees"/>
     </genClasses>
+    <genClasses ecoreClass="product.ecore#//ClassificationType">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute product.ecore#//ClassificationType/name"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/model/product.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/model/product.xsd
deleted file mode 100644
index 782f8af09..000000000
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/model/product.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.eclipse.org/emf/teneo/samples/emf/sample/product"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:this="http://www.eclipse.org/emf/teneo/samples/emf/sample/product"
-    xmlns:lib="http://www.eclipse.org/emf/teneo/samples/emf/sample/product"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns="http://www.w3.org/2001/XMLSchema">
-	
-	<complexType name="ProductType">
-		<sequence>
-			<element name="Code" type="string" default="c1"/>
-			<element name="ID" type="ID"/>
-			<element name="Supplier" type="this:SupplierType" ecore:reference="SupplierType" this:transient="true"/>
-			<element name="Price" type="double"/>
-			<element name="CreatedOn" type="date"/>
-		</sequence>
-	</complexType>
-	
-	<complexType name="SupplierType">
-		<sequence>
-			<element name="Name" type="string"/>
-			<element name="NoOfEmployees" type="int"/>
-		</sequence>
-	</complexType>
-
-</schema>
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/util/ProductAdapterFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/util/ProductAdapterFactory.java
index c4cc6bc0c..4664b8f83 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/util/ProductAdapterFactory.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/util/ProductAdapterFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ProductAdapterFactory.java,v 1.2 2006/07/22 13:01:17 mtaal Exp $
+ * $Id: ProductAdapterFactory.java,v 1.3 2006/11/15 17:18:17 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.sample.product.util;
 
@@ -10,6 +10,8 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.teneo.samples.emf.sample.product.*;
+
 import org.eclipse.emf.teneo.samples.emf.sample.product.ProductPackage;
 import org.eclipse.emf.teneo.samples.emf.sample.product.ProductType;
 import org.eclipse.emf.teneo.samples.emf.sample.product.SupplierType;
@@ -75,6 +77,9 @@ public class ProductAdapterFactory extends AdapterFactoryImpl {
 			public Object caseSupplierType(SupplierType object) {
 				return createSupplierTypeAdapter();
 			}
+			public Object caseClassificationType(ClassificationType object) {
+				return createClassificationTypeAdapter();
+			}
 			public Object defaultCase(EObject object) {
 				return createEObjectAdapter();
 			}
@@ -122,6 +127,20 @@ public class ProductAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.sample.product.ClassificationType <em>Classification Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.teneo.samples.emf.sample.product.ClassificationType
+	 * @generated
+	 */
+	public Adapter createClassificationTypeAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/util/ProductSwitch.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/util/ProductSwitch.java
index e89f16a9b..37b34d015 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/util/ProductSwitch.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/sample/product/util/ProductSwitch.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ProductSwitch.java,v 1.2 2006/07/22 13:01:17 mtaal Exp $
+ * $Id: ProductSwitch.java,v 1.3 2006/11/15 17:18:17 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.sample.product.util;
 
@@ -10,6 +10,8 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.teneo.samples.emf.sample.product.*;
+
 import org.eclipse.emf.teneo.samples.emf.sample.product.ProductPackage;
 import org.eclipse.emf.teneo.samples.emf.sample.product.ProductType;
 import org.eclipse.emf.teneo.samples.emf.sample.product.SupplierType;
@@ -100,6 +102,12 @@ public class ProductSwitch {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case ProductPackage.CLASSIFICATION_TYPE: {
+				ClassificationType classificationType = (ClassificationType)theEObject;
+				Object result = caseClassificationType(classificationType);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -135,6 +143,21 @@ public class ProductSwitch {
 	}
 
 	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Classification Type</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Classification Type</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseClassificationType(ClassificationType object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/examples/org.eclipse.emf.teneo.samples/test/notation.ecore b/examples/org.eclipse.emf.teneo.samples/test/notation.ecore
new file mode 100644
index 000000000..689a1137f
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/test/notation.ecore
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="notation"
+    nsURI="http://www.eclipse.org/gmf/runtime/1.0.0/notation" nsPrefix="notation">
+  <eClassifiers xsi:type="ecore:EClass" name="Edge" eSuperTypes="#//View">
+    <eOperations name="createBendpoints" eType="#//Bendpoints">
+      <eParameters name="eClass" eType="ecore:EClass ../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+    </eOperations>
+    <eOperations name="createSourceAnchor" eType="#//Anchor">
+      <eParameters name="eClass" eType="ecore:EClass ../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+    </eOperations>
+    <eOperations name="createTargetAnchor" eType="#//Anchor">
+      <eParameters name="eClass" eType="ecore:EClass ../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="source" lowerBound="1"
+        eType="#//View" resolveProxies="false" eOpposite="#//View/sourceEdges"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
+        eType="#//View" resolveProxies="false" eOpposite="#//View/targetEdges"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="bendpoints" eType="#//Bendpoints"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceAnchor" eType="#//Anchor"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="targetAnchor" eType="#//Anchor"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//View">
+    <eOperations name="createLayoutConstraint" eType="#//LayoutConstraint">
+      <eParameters name="eClass" eType="ecore:EClass ../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="layoutConstraint" eType="#//LayoutConstraint"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Style" abstract="true" interface="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="FillStyle" eSuperTypes="#//Style">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fillColor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="16777215"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="LineStyle" eSuperTypes="#//Style">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineColor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="11579568"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FontStyle" eSuperTypes="#//Style">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontColor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral="Tahoma"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="9"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bold" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="italic" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="underline" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strikeThrough" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="TitleStyle" eSuperTypes="#//Style">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="showTitle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SortingStyle" eSuperTypes="#//Style">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sorting" eType="#//Sorting"
+        defaultValueLiteral="None"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sortingKeys" eType="#//SortKeyMap"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="sortedObjects" upperBound="-1"
+        eType="ecore:EClass ../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="DescriptionStyle" eSuperTypes="#//Style">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral=""/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="LayoutConstraint" abstract="true" interface="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Size" eSuperTypes="#//LayoutConstraint">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="-1"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="-1"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Location" eSuperTypes="#//LayoutConstraint">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="0"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Bounds" eSuperTypes="#//Location #//Size"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Ratio" eSuperTypes="#//LayoutConstraint">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="-1"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Anchor" abstract="true" interface="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Bendpoints" abstract="true" interface="true"/>
+  <eClassifiers xsi:type="ecore:EEnum" name="Sorting">
+    <eLiterals name="None"/>
+    <eLiterals name="Manual" value="1"/>
+    <eLiterals name="Automatic" value="2"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Filtering">
+    <eLiterals name="None"/>
+    <eLiterals name="Manual" value="1"/>
+    <eLiterals name="Automatic" value="2"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IdentityAnchor" eSuperTypes="#//Anchor">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral="anchor"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Routing">
+    <eLiterals name="Manual"/>
+    <eLiterals name="Rectilinear" value="1"/>
+    <eLiterals name="Tree" value="2"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Smoothness">
+    <eLiterals name="None"/>
+    <eLiterals name="Normal" value="1"/>
+    <eLiterals name="Less" value="2"/>
+    <eLiterals name="More" value="3"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="JumpLinkStatus">
+    <eLiterals name="None"/>
+    <eLiterals name="All" value="1"/>
+    <eLiterals name="Below" value="2"/>
+    <eLiterals name="Above" value="3"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="JumpLinkType">
+    <eLiterals name="Semicircle"/>
+    <eLiterals name="Square" value="1"/>
+    <eLiterals name="Chamfered" value="2"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RoutingStyle" eSuperTypes="#//Style">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="routing" eType="#//Routing"
+        defaultValueLiteral="Manual"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="smoothness" eType="#//Smoothness"
+        defaultValueLiteral="None"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="avoidObstructions" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="closestDistance" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jumpLinkStatus" eType="#//JumpLinkStatus"
+        defaultValueLiteral="None"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jumpLinkType" eType="#//JumpLinkType"
+        defaultValueLiteral="Semicircle"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jumpLinksReverse" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="View" abstract="true" eSuperTypes="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">
+    <eOperations name="getStyle" eType="#//Style">
+      <eParameters name="eClass" eType="ecore:EClass ../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+    </eOperations>
+    <eOperations name="createChild" eType="#//Node">
+      <eParameters name="eClass" eType="ecore:EClass ../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+    </eOperations>
+    <eOperations name="createStyle" eType="#//Style">
+      <eParameters name="eClass" eType="ecore:EClass ../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral=""/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mutable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        transient="true" defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceEdges" upperBound="-1"
+        eType="#//Edge" transient="true" resolveProxies="false" eOpposite="#//Edge/source"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="targetEdges" upperBound="-1"
+        eType="#//Edge" transient="true" resolveProxies="false" eOpposite="#//Edge/target"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="persistedChildren" upperBound="-1"
+        eType="#//Node" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="styles" upperBound="-1"
+        eType="#//Style" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="ecore:EClass ../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"
+        unsettable="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" lowerBound="1"
+        eType="#//Diagram" changeable="false" volatile="true" transient="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="transientChildren" upperBound="-1"
+        eType="#//Node" transient="true" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RelativeBendpoints" eSuperTypes="#//Bendpoints">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="points" eType="#//RelativeBendpointList"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Diagram" eSuperTypes="#//View">
+    <eOperations name="createEdge" eType="#//Edge">
+      <eParameters name="eClass" eType="ecore:EClass ../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral=""/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="measurementUnit" eType="#//MeasurementUnit"
+        defaultValueLiteral="Himetric" unsettable="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="persistedEdges" upperBound="-1"
+        eType="#//Edge" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="TransientEdges" upperBound="-1"
+        eType="#//Edge" transient="true" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Image">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="data" eType="ecore:EDataType ../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EByteArray"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CanonicalStyle" eSuperTypes="#//Style">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="canonical" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ShapeStyle" eSuperTypes="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject #//FontStyle #//DescriptionStyle #//FillStyle #//LineStyle"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ConnectorStyle" eSuperTypes="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject #//RoutingStyle #//LineStyle"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="RelativeBendpointList" instanceClassName="java.util.List"/>
+  <eClassifiers xsi:type="ecore:EClass" name="PageStyle" eSuperTypes="#//Style">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pageX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pageY" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pageWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="100"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pageHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="100"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="DrawerStyle" eSuperTypes="#//Style">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="collapsed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="GuideStyle" eSuperTypes="#//Style">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="horizontalGuides" upperBound="-1"
+        eType="#//Guide" containment="true" resolveProxies="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="verticalGuides" upperBound="-1"
+        eType="#//Guide" containment="true" resolveProxies="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Guide">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="position" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="0"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="nodeMap" upperBound="-1"
+        eType="#//NodeEntry" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="NodeEntry" instanceClassName="java.util.Map$Entry">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//Alignment"
+        defaultValueLiteral="Center"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="key" lowerBound="1" eType="#//Node"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Alignment">
+    <eLiterals name="Left"/>
+    <eLiterals name="Right" value="1"/>
+    <eLiterals name="Center" value="2"/>
+    <eLiterals name="Top" value="3"/>
+    <eLiterals name="Bottom" value="4"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FilteringStyle" eSuperTypes="#//Style">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="filtering" eType="#//Filtering"
+        defaultValueLiteral="None"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="filteringKeys" eType="#//FilterKeyList"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="filteredObjects" upperBound="-1"
+        eType="ecore:EClass ../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="FilterKeyList" instanceClassName="java.util.List"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="SortKeyMap" instanceClassName="java.util.Map"/>
+  <eClassifiers xsi:type="ecore:EEnum" name="SortingDirection">
+    <eLiterals name="Ascending"/>
+    <eLiterals name="Descending" value="1"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="DiagramStyle" eSuperTypes="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject #//PageStyle #//GuideStyle #//DescriptionStyle"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ImageStyle" eSuperTypes="#//Style">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="antiAlias" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+        defaultValueLiteral="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maintainAspectRatio" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+        defaultValueLiteral="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="cropBound" lowerBound="1"
+        eType="#//Bounds" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ImageBufferStyle" eSuperTypes="#//ImageStyle">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="imageBuffer" lowerBound="1"
+        eType="#//Image" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="MeasurementUnit">
+    <eLiterals name="Himetric"/>
+    <eLiterals name="Pixel" value="1"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/examples/org.eclipse.emf.teneo.samples/test/options.ecore b/examples/org.eclipse.emf.teneo.samples/test/options.ecore
deleted file mode 100644
index 4f9aee7f1..000000000
--- a/examples/org.eclipse.emf.teneo.samples/test/options.ecore
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="com"
-    nsURI="http:///com.ecore" nsPrefix="com">
-  <eSubpackages name="pareis" nsURI="http:///com/pareis.ecore" nsPrefix="com.pareis">
-    <eSubpackages name="trading" nsURI="http:///com/pareis/trading.ecore" nsPrefix="com.pareis.trading">
-      <eClassifiers xsi:type="ecore:EClass" name="Client" eSuperTypes="#//pareis/trading/Identifiable">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="A Mandant or a Client"/>
-        </eAnnotations>
-        <eOperations name="createDefaultStructure" eType="#//pareis/trading/yahoo/Yahoo"/>
-        <eOperations name="createYahooStructureAndSeed"/>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="System" eType="#//pareis/trading/System"
-            transient="true" eOpposite="#//pareis/trading/System/clients"/>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="vendors" upperBound="-1"
-            eType="#//pareis/trading/yahoo/Yahoo" containment="true" eOpposite="#//pareis/trading/yahoo/Yahoo/Client"/>
-      </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="Identifiable" abstract="true" interface="true">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="System" eSuperTypes="#//pareis/trading/Identifiable">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="global singleton, representing the system or the application"/>
-        </eAnnotations>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="clients" upperBound="-1"
-            eType="#//pareis/trading/Client" containment="true" eOpposite="#//pareis/trading/Client/System"/>
-      </eClassifiers>
-      <eSubpackages name="yahoo" nsURI="http:///com/pareis/trading/yahoo.ecore" nsPrefix="com.pareis.trading.yahoo">
-        <eClassifiers xsi:type="ecore:EClass" name="Yahoo" eSuperTypes="#//pareis/trading/Identifiable">
-          <eStructuralFeatures xsi:type="ecore:EReference" name="indicesComponentsSource"
-              eType="#//pareis/trading/yahoo/YahooIndicesComponentsSource" containment="true"
-              eOpposite="#//pareis/trading/yahoo/YahooIndicesComponentsSource/vendor"/>
-          <eStructuralFeatures xsi:type="ecore:EReference" name="indicesSeed" eType="#//pareis/trading/yahoo/YahooIndicesSeed"
-              containment="true" eOpposite="#//pareis/trading/yahoo/YahooIndicesSeed/vendor"/>
-          <eStructuralFeatures xsi:type="ecore:EReference" name="Client" eType="#//pareis/trading/Client"
-              transient="true" eOpposite="#//pareis/trading/Client/vendors"/>
-        </eClassifiers>
-        <eClassifiers xsi:type="ecore:EClass" name="YahooIndicesComponentsSource"
-            eSuperTypes="#//pareis/trading/Identifiable">
-          <eOperations name="addToAllStockIndices"/>
-          <eStructuralFeatures xsi:type="ecore:EReference" name="vendor" eType="#//pareis/trading/yahoo/Yahoo"
-              transient="true" eOpposite="#//pareis/trading/yahoo/Yahoo/indicesComponentsSource"/>
-        </eClassifiers>
-        <eClassifiers xsi:type="ecore:EClass" name="YahooIndicesSeed" eSuperTypes="#//pareis/trading/Identifiable">
-          <eOperations name="seed"/>
-          <eStructuralFeatures xsi:type="ecore:EAttribute" name="seedSymbols" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-              defaultValueLiteral="^NDX ^DJI ^DJA ^NJ ^GSPC">
-            <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-              <details key="documentation" value="the symbols have to be separated by space"/>
-            </eAnnotations>
-          </eStructuralFeatures>
-          <eStructuralFeatures xsi:type="ecore:EReference" name="vendor" eType="#//pareis/trading/yahoo/Yahoo"
-              transient="true" eOpposite="#//pareis/trading/yahoo/Yahoo/indicesSeed"/>
-        </eClassifiers>
-      </eSubpackages>
-    </eSubpackages>
-  </eSubpackages>
-</ecore:EPackage>
diff --git a/examples/org.eclipse.emf.teneo.samples/test/options.genmodel b/examples/org.eclipse.emf.teneo.samples/test/options.genmodel
deleted file mode 100644
index 87cc45bc4..000000000
--- a/examples/org.eclipse.emf.teneo.samples/test/options.genmodel
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src"
-    modelPluginID="org.eclipse.emf.teneo.samples" modelName="Options" importerID="org.eclipse.emf.importer.ecore">
-  <foreignModel>options.ecore</foreignModel>
-  <genPackages prefix="Com" disposableProviderFactory="true" ecorePackage="options.ecore#/">
-    <nestedGenPackages prefix="Pareis" basePackage="com" disposableProviderFactory="true"
-        ecorePackage="options.ecore#//pareis">
-      <nestedGenPackages prefix="Trading" basePackage="com.pareis" disposableProviderFactory="true"
-          ecorePackage="options.ecore#//pareis/trading">
-        <genClasses ecoreClass="options.ecore#//pareis/trading/Client">
-          <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference options.ecore#//pareis/trading/Client/System"/>
-          <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference options.ecore#//pareis/trading/Client/vendors"/>
-          <genOperations ecoreOperation="options.ecore#//pareis/trading/Client/createDefaultStructure"/>
-          <genOperations ecoreOperation="options.ecore#//pareis/trading/Client/createYahooStructureAndSeed"/>
-        </genClasses>
-        <genClasses image="false" ecoreClass="options.ecore#//pareis/trading/Identifiable">
-          <genFeatures createChild="false" ecoreFeature="ecore:EAttribute options.ecore#//pareis/trading/Identifiable/id"/>
-        </genClasses>
-        <genClasses ecoreClass="options.ecore#//pareis/trading/System">
-          <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference options.ecore#//pareis/trading/System/clients"/>
-        </genClasses>
-        <nestedGenPackages prefix="Yahoo" basePackage="com.pareis.trading" disposableProviderFactory="true"
-            ecorePackage="options.ecore#//pareis/trading/yahoo">
-          <genClasses ecoreClass="options.ecore#//pareis/trading/yahoo/Yahoo">
-            <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference options.ecore#//pareis/trading/yahoo/Yahoo/indicesComponentsSource"/>
-            <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference options.ecore#//pareis/trading/yahoo/Yahoo/indicesSeed"/>
-            <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference options.ecore#//pareis/trading/yahoo/Yahoo/Client"/>
-          </genClasses>
-          <genClasses ecoreClass="options.ecore#//pareis/trading/yahoo/YahooIndicesComponentsSource">
-            <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference options.ecore#//pareis/trading/yahoo/YahooIndicesComponentsSource/vendor"/>
-            <genOperations ecoreOperation="options.ecore#//pareis/trading/yahoo/YahooIndicesComponentsSource/addToAllStockIndices"/>
-          </genClasses>
-          <genClasses ecoreClass="options.ecore#//pareis/trading/yahoo/YahooIndicesSeed">
-            <genFeatures createChild="false" ecoreFeature="ecore:EAttribute options.ecore#//pareis/trading/yahoo/YahooIndicesSeed/seedSymbols"/>
-            <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference options.ecore#//pareis/trading/yahoo/YahooIndicesSeed/vendor"/>
-            <genOperations ecoreOperation="options.ecore#//pareis/trading/yahoo/YahooIndicesSeed/seed"/>
-          </genClasses>
-        </nestedGenPackages>
-      </nestedGenPackages>
-    </nestedGenPackages>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/DefaultAnnotator.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/DefaultAnnotator.java
index dfcb48e4b..bc9f31d21 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/DefaultAnnotator.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/DefaultAnnotator.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  * 
- * $Id: DefaultAnnotator.java,v 1.14 2006/11/13 14:53:08 mtaal Exp $
+ * $Id: DefaultAnnotator.java,v 1.15 2006/11/15 17:17:46 mtaal Exp $
  */
  
 package org.eclipse.emf.teneo.annotations.mapper;
@@ -36,6 +36,7 @@ import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.util.FeatureMapUtil;
 import org.eclipse.emf.teneo.PersistenceOptions;
 import org.eclipse.emf.teneo.annotations.StoreAnnotationsException;
@@ -79,7 +80,7 @@ import org.eclipse.emf.teneo.util.StoreUtil;
  * information. It sets the default annotations according to the ejb3 spec.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
  */
 public class DefaultAnnotator {
 
@@ -807,7 +808,9 @@ public class DefaultAnnotator {
 		}
 
 		// only use a jointable if the relation is non unique
-		if ((optionJoinTableForNonContainedAssociations && !eReference.isContainment()) || !otm.isUnique()) {
+		final boolean isEObject = StoreUtil.EOBJECT_ECLASS_URI.compareTo(otm.getTargetEntity()) == 0;
+		if (isEObject || // in case of eobject always a join table is required 
+				(optionJoinTableForNonContainedAssociations && !eReference.isContainment()) || !otm.isUnique()) {
 			JoinTable joinTable = aReference.getJoinTable();
 			if (joinTable == null) {
 				joinTable = aFactory.createJoinTable();
@@ -817,13 +820,13 @@ public class DefaultAnnotator {
 
 			// see remark in manytomany about naming of jointables
 			if (joinTable.getName() == null) {
-				if (optionJoinTableNamingStrategy.compareToIgnoreCase("ejb3") == 0) {
+				if (!isEObject && optionJoinTableNamingStrategy.compareToIgnoreCase("ejb3") == 0) {
 					final String jTableName = getEntityName(eReference.getEContainingClass())
 						+ "_" + getEntityName(eReference.getEReferenceType());
 					joinTable.setName(trunc(jTableName, false));
 				} else {
 					AssertUtil.assertTrue("option optionJoinTableNamingStrategy " + optionJoinTableNamingStrategy +
-							" not supported", optionJoinTableNamingStrategy.compareToIgnoreCase("unique") == 0);
+							" not supported", isEObject || optionJoinTableNamingStrategy.compareToIgnoreCase("unique") == 0);
 					final String jTableName = getEntityName(eReference.getEContainingClass()) + "_"
 						+ eReference.getName();
 					joinTable.setName(trunc(jTableName, false));
@@ -1301,7 +1304,7 @@ public class DefaultAnnotator {
 		final PAnnotatedEClass aclass = annotatedModel.getPAnnotated(eclass);
 		if (aclass != null && aclass.getEntity() != null) {
 			return aclass.getEntity().getName();
-		} 
+		}
 		return StoreUtil.getEClassURI(eclass, optionQualifyEClass);
 	}
 
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.eclipse/src/org/eclipse/emf/teneo/hibernate/eclipse/ImportXML.java b/plugins/org.eclipse.emf.teneo.hibernate.eclipse/src/org/eclipse/emf/teneo/hibernate/eclipse/ImportXML.java
index 5c96aed4e..8de285cc1 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.eclipse/src/org/eclipse/emf/teneo/hibernate/eclipse/ImportXML.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.eclipse/src/org/eclipse/emf/teneo/hibernate/eclipse/ImportXML.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: ImportXML.java,v 1.1 2006/07/08 15:04:38 mtaal Exp $
+ * $Id: ImportXML.java,v 1.2 2006/11/15 17:17:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.eclipse;
@@ -32,7 +32,7 @@ import org.eclipse.emf.teneo.hibernate.HbUtil;
  * Performs the import xml action
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 
 public class ImportXML extends StoreImportXML {
@@ -46,9 +46,9 @@ public class ImportXML extends StoreImportXML {
 				is.close();
 			}
 		} catch (IOException i) {
-			throw new StoreEclipseException("IO exception while importing xmi", i);
+			throw new StoreEclipseException("IO exception while importing xml", i);
 		} catch (CoreException c) {
-			throw new StoreEclipseException("Core exception while importing xmi", c);
+			throw new StoreEclipseException("Core exception while importing xml", c);
 		}
 	}
 }
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java
index 9108227b3..284b9d64b 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: AbstractAssociationMapper.java,v 1.3 2006/11/13 14:53:00 mtaal Exp $
+ * $Id: AbstractAssociationMapper.java,v 1.4 2006/11/15 17:17:52 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.mapper;
@@ -61,6 +61,10 @@ abstract class AbstractAssociationMapper extends AbstractMapper {
 		final String assocName = getHbmContext().getPropertyName(aReference.getAnnotatedEReference());
 		log.debug("addManyToOne " + assocName + "/" + referedTo);
 
+		if (isEObject(referedTo)) {
+			return getHbmContext().getCurrent().addElement("any").addAttribute("name", assocName).addAttribute(
+					"id-type", "long");
+		}
 		if (isReferedEntity) {
 			return getHbmContext().getCurrent().addElement("many-to-one").addAttribute("name", assocName).addAttribute(
 					"entity-name", referedTo);
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractMapper.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractMapper.java
index 90eae0287..55f064fe4 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractMapper.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractMapper.java
@@ -12,7 +12,7 @@
  *   Davide Marchignoli
  * </copyright>
  *
- * $Id: AbstractMapper.java,v 1.4 2006/11/13 19:55:09 mtaal Exp $
+ * $Id: AbstractMapper.java,v 1.5 2006/11/15 17:17:52 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.mapper;
@@ -28,10 +28,12 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference;
 import org.eclipse.emf.teneo.annotations.pannotation.Column;
 import org.eclipse.emf.teneo.annotations.pannotation.PannotationFactory;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Cache;
+import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType;
 import org.eclipse.emf.teneo.simpledom.Element;
 import org.eclipse.emf.teneo.util.EcoreDataTypes;
+import org.eclipse.emf.teneo.util.StoreUtil;
 
 /**
  * Base class for all mapping classes. Provides access to the hbmcontext.
@@ -64,12 +66,58 @@ abstract class AbstractMapper {
 		return hbmContext;
 	}
 
+	/** Handles the type or typedef annotations */
+	protected void setType(PAnnotatedEAttribute paAttribute, Element propElement) {
+
+		// handle the type annotation
+		final HbAnnotatedEAttribute hea = (HbAnnotatedEAttribute) paAttribute;
+		final EDataType ed = (EDataType) hea.getAnnotatedEAttribute().getEType();
+		final HbAnnotatedEDataType hed = (HbAnnotatedEDataType) hea.getPaModel().getPAnnotated(ed);
+
+		final String name;
+		final List params;
+		if (hea.getHbType() != null) {
+			name = hea.getHbType().getType();
+			params = hea.getHbType().getParameters();
+		} else if (hed != null && hed.getHbTypeDef() != null) {
+			name = hed.getHbTypeDef().getName();
+			params = null;
+		} else {
+			name = null;
+			params = null;
+		}
+		if (name != null) {
+			if (params == null || params.isEmpty()) {
+				// simple
+				propElement.addAttribute("type", name);
+			} else {
+				final Element typeElement = propElement.addElement("type").addAttribute("name", name);
+				for (Iterator it = params.iterator(); it.hasNext();) {
+					final Parameter param = (Parameter) it.next();
+					typeElement.addElement("param").addAttribute("name", param.getName()).addText(param.getValue());
+				}
+			}
+		} else {
+			final String hType = hbType(paAttribute);
+			if (hType != null) {
+				propElement.addAttribute("type", hType);
+			} else {
+				final Element typeElement = propElement.addElement("type").addAttribute("name",
+						hbmContext.getDefaultUserType());
+				typeElement.addElement("param").addAttribute("name", HbMapperConstants.EDATATYPE_PARAM).addText(
+						paAttribute.getAnnotatedEAttribute().getEAttributeType().getName());
+				typeElement.addElement("param").addAttribute("name", HbMapperConstants.EPACKAGE_PARAM).addText(
+						paAttribute.getAnnotatedEAttribute().getEType().getEPackage().getNsURI());
+			}
+		}
+	}
+
 	/**
 	 * @return Returns the hibernate name for the given Ecore data type.
 	 * @throws MappingException
 	 *             if no corresponding hb type is defined.
 	 */
-	protected String hbType(PAnnotatedEAttribute paAttribute) {
+	private String hbType(PAnnotatedEAttribute paAttribute) {
 		final EAttribute eAttribute = paAttribute.getAnnotatedEAttribute();
 		final HbAnnotatedEDataType hed = (HbAnnotatedEDataType) paAttribute.getPaModel().getPAnnotated(
 				eAttribute.getEAttributeType());
@@ -82,13 +130,13 @@ abstract class AbstractMapper {
 			return eDataType.getInstanceClassName();
 		} else if (EcoreDataTypes.INSTANCE.isEDate(eDataType)) {
 			return "java.util.Date";
-		} else if (eDataType.getInstanceClass() == Object.class) {
-			return "serializable"; // MT: this is sometimes the best/robust approach
+		} else if (eDataType.getInstanceClass() != null && eDataType.getInstanceClass() == Object.class) {
+			return null; // "org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType";
 		} else if (eDataType.getInstanceClass() != null) {
 			return eDataType.getInstanceClassName();
 		} else {
-			return "serializable"; // MT: this is sometimes the best/robust approach
-			// throw new MappingException("Do not know how to handle type " + eDataType);
+			// all edatatypes are translatable to a string
+			return null; // "org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType";
 		}
 	}
 
@@ -135,7 +183,7 @@ abstract class AbstractMapper {
 				name = getHbmContext().trunc(defaultName);
 			}
 			final Column col = PannotationFactory.eINSTANCE.createColumn();
-			col.setName(name);
+			col.setName(hbmContext.trunc(name));
 			col.setNullable(isNullable);
 			columns.add(col);
 		}
@@ -145,6 +193,20 @@ abstract class AbstractMapper {
 		}
 	}
 
+	/** Adds anytype columns */
+	protected List getAnyTypeColumns(String featureName, boolean isNullable) {
+		final ArrayList result = new ArrayList();
+		final Column typeColumn = PannotationFactory.eINSTANCE.createColumn();
+		typeColumn.setName(hbmContext.trunc(featureName + "_type"));
+		typeColumn.setNullable(isNullable);
+		result.add(typeColumn);
+		final Column idColumn = PannotationFactory.eINSTANCE.createColumn();
+		idColumn.setName(hbmContext.trunc(featureName + "_id"));
+		idColumn.setNullable(isNullable);
+		result.add(idColumn);
+		return result;
+	}
+
 	/**
 	 * Returns the (possibly overridden) columns annotation for the given attribute.
 	 */
@@ -227,4 +289,12 @@ abstract class AbstractMapper {
 			}
 		}
 	}
+
+	/** Returns true if the target is the general EObject type */
+	protected boolean isEObject(String typeName) {
+		if (typeName == null) {
+			return false;
+		}
+		return typeName.compareTo(StoreUtil.EOBJECT_ECLASS_URI) == 0;
+	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/BasicMapper.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/BasicMapper.java
index 41f446071..c6d80bb52 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/BasicMapper.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/BasicMapper.java
@@ -12,12 +12,11 @@
  *   Davide Marchignoli
  * </copyright>
  *
- * $Id: BasicMapper.java,v 1.5 2006/11/13 19:55:09 mtaal Exp $
+ * $Id: BasicMapper.java,v 1.6 2006/11/15 17:17:52 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.mapper;
 
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
@@ -32,7 +31,6 @@ import org.eclipse.emf.teneo.annotations.pannotation.Enumerated;
 import org.eclipse.emf.teneo.annotations.pannotation.FetchType;
 import org.eclipse.emf.teneo.annotations.pannotation.PannotationFactory;
 import org.eclipse.emf.teneo.annotations.pannotation.TemporalType;
-import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType;
 import org.eclipse.emf.teneo.simpledom.Element;
@@ -73,22 +71,21 @@ class BasicMapper extends AbstractPropertyMapper {
 
 		final EAttribute eAttribute = paAttribute.getAnnotatedEAttribute();
 
-		final Element propElement = addProperty(paAttribute);
+		final EAttribute eattr = paAttribute.getAnnotatedEAttribute();
+		final String attrName = getHbmContext().getPropertyName(eattr);
+		final Element propElement = getHbmContext().getCurrent().addElement("property").addAttribute("name", attrName);
 
 		Basic basic = paAttribute.getBasic();
 		if (basic == null) {
 			basic = PannotationFactory.eINSTANCE.createBasic();
 		}
 
-		// Buildtime enhancement not supported
 		propElement.addAttribute("lazy", FetchType.LAZY_LITERAL.equals(basic.getFetch()) ? "true" : "false");
 		addColumns(propElement, eAttribute.getName(), getColumns(paAttribute), getHbmContext()
 				.isCurrentElementFeatureMap()
 				|| isNullable(basic, eAttribute), true);
 		propElement.addAttribute("not-null", isNullable(basic, eAttribute) ? "false" : "true");
-
-		handleTypeDef(paAttribute, propElement);
-		// propElement.addAttribute("unique", eAttribute.isUnique() ? "true" : "false");
+		setType(paAttribute, propElement);
 	}
 
 	/**
@@ -98,8 +95,14 @@ class BasicMapper extends AbstractPropertyMapper {
 		final EAttribute eAttribute = paAttribute.getAnnotatedEAttribute();
 		log.debug("processTemporal " + paAttribute.getAnnotatedEAttribute().getName());
 
-		// TODO consider also Calendar type
-		final Element propElement = addProperty(eAttribute, paAttribute.getTemporal().getValue());
+		TemporalType tt = paAttribute.getTemporal().getValue();
+		final String attrName = getHbmContext().getPropertyName(paAttribute.getAnnotatedEAttribute());
+		log.debug("addProperty: " + attrName + " temporal " + tt.getName());
+		final HbAnnotatedEAttribute hea = (HbAnnotatedEAttribute) paAttribute;
+		final HbAnnotatedEDataType hed = (HbAnnotatedEDataType) paAttribute.getPaModel().getPAnnotated(
+				paAttribute.getAnnotatedEAttribute().getEAttributeType());
+
+		final Element propElement = getHbmContext().getCurrent().addElement("property").addAttribute("name", attrName);
 
 		Basic basic = paAttribute.getBasic();
 		if (basic == null) {
@@ -111,7 +114,12 @@ class BasicMapper extends AbstractPropertyMapper {
 				.isCurrentElementFeatureMap()
 				|| isNullable(basic, eAttribute), true);
 		propElement.addAttribute("not-null", isNullable(basic, eAttribute) ? "false" : "true");
-		handleTypeDef(paAttribute, propElement);
+
+		if (hed.getHbTypeDef() != null || hea.getHbType() != null) {
+			setType(paAttribute, propElement);
+		} else {
+			propElement.addAttribute("type", BasicMapper.hbType(tt));
+		}
 	}
 
 	/**
@@ -135,7 +143,6 @@ class BasicMapper extends AbstractPropertyMapper {
 
 		final Element propElement = getHbmContext().getCurrent().addElement("property");
 		propElement.addAttribute("name", getHbmContext().getPropertyName(eAttribute));
-		propElement.addAttribute("type", columnType);
 
 		Basic basic = paAttribute.getBasic();
 		if (basic == null) {
@@ -146,7 +153,7 @@ class BasicMapper extends AbstractPropertyMapper {
 		addColumns(propElement, paAttribute.getAnnotatedEAttribute().getName(), getColumns(paAttribute),
 				getHbmContext().isCurrentElementFeatureMap() || isNullable(basic, eAttribute), true);
 		propElement.addAttribute("not-null", isNullable(basic, eAttribute) ? "false" : "true");
-		handleTypeDef(paAttribute, propElement);
+		setType(paAttribute, propElement);
 	}
 
 	/**
@@ -178,7 +185,7 @@ class BasicMapper extends AbstractPropertyMapper {
 		final EDataType ed = (EDataType) hea.getAnnotatedEAttribute().getEType();
 		final HbAnnotatedEDataType hed = (HbAnnotatedEDataType) hea.getPaModel().getPAnnotated(ed);
 		if (hed.getHbTypeDef() != null || hea.getHbType() != null) {
-			handleTypeDef(paAttribute, propElement);
+			setType(paAttribute, propElement);
 		} else if (getHbmContext().isEasyEMFGenerated(eclassifier)) {
 			final Class instanceClass = getHbmContext().getImpl(eclassifier);
 			propElement.addElement("type").addAttribute("name", getEnumUserType(enumerated)).addElement("param")
@@ -204,44 +211,6 @@ class BasicMapper extends AbstractPropertyMapper {
 		}
 	}
 
-	/** Handles the type or typedef annotations */
-	protected void handleTypeDef(PAnnotatedEAttribute paAttribute, Element propElement) {
-
-		// handle the type annotation
-		final HbAnnotatedEAttribute hea = (HbAnnotatedEAttribute) paAttribute;
-		final EDataType ed = (EDataType) hea.getAnnotatedEAttribute().getEType();
-		final HbAnnotatedEDataType hed = (HbAnnotatedEDataType) hea.getPaModel().getPAnnotated(ed);
-
-		if (hed == null) { // edatatype not defined in this epackage (probably emf native)
-			return;
-		}
-
-		final String name;
-		final List params;
-		if (hea.getHbType() != null) {
-			name = hea.getHbType().getType();
-			params = hea.getHbType().getParameters();
-		} else if (hed.getHbTypeDef() != null) {
-			name = hed.getHbTypeDef().getName();
-			params = null;
-		} else {
-			name = null;
-			params = null;
-		}
-		if (name != null) {
-			if (params == null || params.isEmpty()) {
-				// simple
-				propElement.addAttribute("type", name);
-			} else {
-				final Element typeElement = propElement.addElement("type").addAttribute("name", name);
-				for (Iterator it = params.iterator(); it.hasNext();) {
-					final Parameter param = (Parameter) it.next();
-					typeElement.addElement("param").addAttribute("name", param.getName()).addText(param.getValue());
-				}
-			}
-		}
-	}
-
 	/**
 	 * Generate hb mapping for the given version attribute.
 	 */
@@ -251,14 +220,14 @@ class BasicMapper extends AbstractPropertyMapper {
 		}
 		final EAttribute eAttribute = paAttribute.getAnnotatedEAttribute();
 		final Element propElement = getHbmContext().getCurrent().addElement("version").addAttribute("name",
-				eAttribute.getName()).addAttribute("type", hbType(paAttribute));
+				eAttribute.getName());
 		List columns = getColumns(paAttribute);
 		if (columns.size() > 1) {
 			log.warn("Version has more than one attribute, only using the first one, eclass: "
 					+ paAttribute.getAnnotatedEAttribute().getEContainingClass().getName());
 		}
 		addColumns(propElement, eAttribute.getName(), columns, getHbmContext().isCurrentElementFeatureMap(), false);
-		handleTypeDef(paAttribute, propElement);
+		setType(paAttribute, propElement);
 	}
 
 	/**
@@ -274,23 +243,6 @@ class BasicMapper extends AbstractPropertyMapper {
 		return BasicMapper.TEMPORAL_TYPE_NAMES[temporalType != null ? temporalType.getValue() : TemporalType.TIMESTAMP];
 	}
 
-	/** Adds a property with name and type set */
-	protected Element addProperty(PAnnotatedEAttribute paAttribute) {
-		final EAttribute eattr = paAttribute.getAnnotatedEAttribute();
-		final String attrName = getHbmContext().getPropertyName(eattr);
-		log.debug("addProperty " + attrName + " of type " + hbType(paAttribute));
-		return getHbmContext().getCurrent().addElement("property").addAttribute("name", attrName).addAttribute("type",
-				hbType(paAttribute));
-	}
-
-	/** Adds a property with the type set */
-	protected Element addProperty(EAttribute eattr, TemporalType attrType) {
-		final String attrName = getHbmContext().getPropertyName(eattr);
-		log.debug("addProperty: " + attrName + " temporal " + attrType.getName());
-		return getHbmContext().getCurrent().addElement("property").addAttribute("name", attrName).addAttribute("type",
-				BasicMapper.hbType(attrType));
-	}
-
 	/**
 	 * A prop is nullable if the basic is optional or the feature is part of a featuremap. The last reason is because
 	 * featuremapentries will have all the features of the featuremap with only one of them filled.
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java
index 5fe33e913..1004b6529 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java
@@ -12,7 +12,7 @@
  *   Davide Marchignoli
  * </copyright>
  *
- * $Id: IdMapper.java,v 1.5 2006/11/13 19:55:08 mtaal Exp $
+ * $Id: IdMapper.java,v 1.6 2006/11/15 17:17:52 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.mapper;
@@ -145,7 +145,7 @@ class IdMapper extends AbstractPropertyMapper {
 			keyPropertyElement.addAttribute("name", aFeature.getAnnotatedEStructuralFeature().getName());
 			addColumns(keyPropertyElement, aAttribute.getAnnotatedEAttribute().getName(), getColumns(aAttribute),
 					getHbmContext().isCurrentElementFeatureMap(), false);
-			keyPropertyElement.addAttribute("type", hbType(aAttribute));
+			setType(aAttribute, keyPropertyElement);
 		}
 		getHbmContext().setCurrent(compositeIdElement.getParent());
 	}
@@ -203,7 +203,7 @@ class IdMapper extends AbstractPropertyMapper {
 
 		usedIdElement.addAttribute("name", eAttribute.getName());
 		if (id.getEnumerated() == null) {
-			usedIdElement.addAttribute("type", hbType(id));
+			setType(id, usedIdElement);
 		} else { // enumerated id
 			if (getHbmContext().isEasyEMFGenerated(id.getAnnotatedEAttribute().getEType())) {
 				// if the instanceclass is registered in the context then this java class is
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyAttributeMapper.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyAttributeMapper.java
index 01df9506d..07359f850 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyAttributeMapper.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyAttributeMapper.java
@@ -12,7 +12,7 @@
  *   Davide Marchignoli
  * </copyright>
  *
- * $Id: ManyAttributeMapper.java,v 1.3 2006/11/13 19:55:09 mtaal Exp $
+ * $Id: ManyAttributeMapper.java,v 1.4 2006/11/15 17:17:52 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.mapper;
@@ -117,7 +117,8 @@ class ManyAttributeMapper extends AbstractAssociationMapper {
 			List columns, String targetEntity) {
 		final Element elElement;
 		if (targetEntity == null) {
-			elElement = collElement.addElement("element").addAttribute("type", hbType(paAttribute));
+			elElement = collElement.addElement("element");
+			setType(paAttribute, elElement);
 		} else {
 			elElement = collElement.addElement("element").addAttribute("type", targetEntity);
 		}
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyToOneMapper.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyToOneMapper.java
index d9fae323f..932c4484c 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyToOneMapper.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyToOneMapper.java
@@ -12,7 +12,7 @@
  *   Davide Marchignoli
  * </copyright>
  *
- * $Id: ManyToOneMapper.java,v 1.2 2006/11/12 00:08:19 mtaal Exp $
+ * $Id: ManyToOneMapper.java,v 1.3 2006/11/15 17:17:52 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.mapper;
@@ -76,17 +76,24 @@ class ManyToOneMapper extends AbstractAssociationMapper {
 
 		final Element associationElement = addManyToOne(paReference, targetName, !isEasyEMFGenerated);
 
-		// associationElement.addAttribute("access", "org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor");
-
 		addCascadesForSingle(associationElement, mto.getCascade());
-		// todo default false until proxies are supported
-		associationElement.addAttribute("lazy", "false");
-		// addFetchType(associationElement, mto.getFetch());
-
-		addJoinColumns(associationElement, jcs, mto.isOptional() || getHbmContext().isCurrentElementFeatureMap());
 
-		associationElement.addAttribute("not-null",
-				mto.isOptional() || getHbmContext().isCurrentElementFeatureMap() ? "false" : "true");
+		if (isEObject(targetName)) {
+			final String erefName = paReference.getAnnotatedEReference().getName();
+			addColumns(associationElement, erefName, getAnyTypeColumns(erefName, true), true, false);
+		} else {
+			// todo default false until proxies are supported
+			if (getHbmContext().isEasyEMFGenerated(paReference.getAnnotatedEReference().getEContainingClass())) {
+				addFetchType(associationElement, mto.getFetch());
+			} else {
+				associationElement.addAttribute("lazy", "false");
+			}
+
+			addJoinColumns(associationElement, jcs, mto.isOptional() || getHbmContext().isCurrentElementFeatureMap());
+
+			associationElement.addAttribute("not-null", mto.isOptional()
+					|| getHbmContext().isCurrentElementFeatureMap() ? "false" : "true");
+		}
 
 		// MT: TODO; the characteristic of the other side should be checked (if present), if the otherside is a onetoone
 		// then this
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingContext.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingContext.java
index 90f2ef2da..065e56b2c 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingContext.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingContext.java
@@ -12,7 +12,7 @@
  *   Davide Marchignoli
  * </copyright>
  *
- * $Id: MappingContext.java,v 1.4 2006/11/13 14:53:00 mtaal Exp $
+ * $Id: MappingContext.java,v 1.5 2006/11/15 17:17:52 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.mapper;
@@ -46,7 +46,7 @@ import org.eclipse.emf.teneo.util.SQLCaseStrategy;
  * Maps a basic attribute with many=true, e.g. list of simpletypes.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  */
 public class MappingContext extends AbstractProcessingContext {
 
@@ -450,4 +450,14 @@ public class MappingContext extends AbstractProcessingContext {
 	public String getDynamicEnumIntegerUserType() {
 		return "org.eclipse.emf.teneo.hibernate.mapping.DynamicENumUserIntegerType";
 	}
+
+	/** Return the default user type */
+	public String getDefaultUserType() {
+		return "org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType";
+	}
+
+	/** Returns the default any type */
+	public String getAnytype() {
+		return "org.eclipse.emf.teneo.hibernate.mapping.AnyEObjectType";
+	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToManyMapper.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToManyMapper.java
index a8dd509fe..16f7d6905 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToManyMapper.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToManyMapper.java
@@ -12,7 +12,7 @@
  *   Davide Marchignoli
  * </copyright>
  *
- * $Id: OneToManyMapper.java,v 1.2 2006/11/12 00:08:19 mtaal Exp $
+ * $Id: OneToManyMapper.java,v 1.3 2006/11/15 17:17:52 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.mapper;
@@ -24,6 +24,7 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature;
@@ -84,8 +85,8 @@ class OneToManyMapper extends AbstractAssociationMapper {
 		}
 
 		final HbAnnotatedEReference hbReference = (HbAnnotatedEReference) paReference;
-
-		final EClass refType = hbReference.getAnnotatedEReference().getEReferenceType();
+		final EReference eref = hbReference.getAnnotatedEReference();
+		final EClass refType = eref.getEReferenceType();
 
 		// TODO add isUnique on interface
 		// TODO request EMF team to deal correctly with unique attribute on EReferences
@@ -100,7 +101,6 @@ class OneToManyMapper extends AbstractAssociationMapper {
 		final Element keyElement = collElement.addElement("key");
 
 		// TODO: throw error if both jointable and joincolumns have been set
-		// MT: below has been added
 		final List jcs = paReference.getJoinColumns() == null ? new ArrayList() : (List) paReference.getJoinColumns();
 		final JoinTable jt = paReference.getJoinTable();
 		if (jt != null) {
@@ -145,7 +145,7 @@ class OneToManyMapper extends AbstractAssociationMapper {
 		// hibernate supports uni otm without join table.
 		if (hbReference.getEmbedded() != null) {
 			addCompositeElement(collElement, targetName, hbReference);
-		} else if (jt != null) {
+		} else if (!isEObject(targetName) && jt != null) {
 			// A m2m forces a join table, note that isunique does not completely follow the semantics of emf, unique on
 			// an otm means that an element can only occur once in the table, if unique is false then you in effect have
 			// a
@@ -154,7 +154,7 @@ class OneToManyMapper extends AbstractAssociationMapper {
 			// To force a jointable on a real otm a jointable annotation should be specified.
 			addManyToMany(collElement, targetName, !isEasyEMFGenerated, inverseJoinColumns, otm.isUnique());
 		} else {
-			addOneToMany(collElement, targetName, !isEasyEMFGenerated);
+			addOneToMany(collElement, eref.getName(), targetName, !isEasyEMFGenerated);
 		}
 	}
 
@@ -169,8 +169,8 @@ class OneToManyMapper extends AbstractAssociationMapper {
 		// final Element collElement = addCollectionElement(paReference.getAnnotatedElement().getName(),
 		// paReference.isIndexed());
 		final Element collElement = addCollectionElement(paReference);
-
-		final EClass refType = paReference.getAnnotatedEReference().getEReferenceType();
+		final EReference eref = paReference.getAnnotatedEReference();
+		final EClass refType = eref.getEReferenceType();
 
 		if (((HbAnnotatedEReference) paReference).getHbCache() != null) {
 			addCacheElement(collElement, ((HbAnnotatedEReference) paReference).getHbCache());
@@ -203,7 +203,7 @@ class OneToManyMapper extends AbstractAssociationMapper {
 		if (isEasyEMFGenerated) {
 			targetName = getHbmContext().getImpl(refType).getName();
 		} else if (targetName == null) {
-			targetName = getHbmContext().getEntityName(paReference.getAnnotatedEReference().getEReferenceType());
+			targetName = getHbmContext().getEntityName(eref.getEReferenceType());
 		}
 
 		if (paReference.getEmbedded() != null) {
@@ -213,7 +213,7 @@ class OneToManyMapper extends AbstractAssociationMapper {
 					.getInverseJoinColumns() : Collections.EMPTY_LIST;
 			addManyToMany(collElement, targetName, !isEasyEMFGenerated, inverseJoinColumns, otm.isUnique());
 		} else {
-			addOneToMany(collElement, targetName, !isEasyEMFGenerated);
+			addOneToMany(collElement, eref.getName(), targetName, !isEasyEMFGenerated);
 		}
 	}
 
@@ -223,8 +223,11 @@ class OneToManyMapper extends AbstractAssociationMapper {
 	 * @param collElement
 	 * @param targetEntity
 	 */
-	private void addOneToMany(Element collElement, String targetEntity, boolean isEntity) {
-		if (isEntity) {
+	private void addOneToMany(Element collElement, String featureName, String targetEntity, boolean isEntity) {
+		if (isEObject(targetEntity)) { // anytype
+			final Element any = collElement.addElement("many-to-any").addAttribute("id-type", "long");
+			addColumns(any, null, getAnyTypeColumns(featureName, false), false, false);
+		} else if (isEntity) {
 			collElement.addElement("one-to-many").addAttribute("entity-name", targetEntity);
 		} else {
 			collElement.addElement("one-to-many").addAttribute("class", targetEntity);
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToOneMapper.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToOneMapper.java
index 3bafa2fc4..6c94086d0 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToOneMapper.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToOneMapper.java
@@ -12,7 +12,7 @@
  *   Davide Marchignoli
  * </copyright>
  *
- * $Id: OneToOneMapper.java,v 1.3 2006/11/13 14:53:00 mtaal Exp $
+ * $Id: OneToOneMapper.java,v 1.4 2006/11/15 17:17:52 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.mapper;
@@ -70,27 +70,34 @@ class OneToOneMapper extends AbstractAssociationMapper {
 		log.debug("Generating many to one mapping for onetoone" + paReference);
 
 		final OneToOne oto = paReference.getOneToOne();
+		final EReference eref = paReference.getAnnotatedEReference();
 		String specifiedName = oto.getTargetEntity();
 
-		final EClass referedTo = paReference.getAnnotatedEReference().getEReferenceType();
+		final EClass referedTo = eref.getEReferenceType();
 		final boolean isEasyEMFGenerated = getHbmContext().isEasyEMFGenerated(referedTo);
 		if (isEasyEMFGenerated) {
 			specifiedName = getHbmContext().getImpl(referedTo).getName();
 		}
 
 		final Element associationElement = addManyToOne(paReference, (specifiedName != null ? specifiedName
-				: getHbmContext().getEntityName(paReference.getAnnotatedEReference().getEReferenceType())),
-				!isEasyEMFGenerated);
+				: getHbmContext().getEntityName(eref.getEReferenceType())), !isEasyEMFGenerated);
 
 		addCascadesForSingle(associationElement, oto.getCascade());
-		// todo default false until proxies are supported
-		associationElement.addAttribute("lazy", "false");
-		// addFetchType(associationElement, oto.getFetch());
-		final List joinColumns = getJoinColumns(paReference);
-		final boolean forceNullable = (oto.isOptional() || getHbmContext().isCurrentElementFeatureMap());
-		addJoinColumns(associationElement, joinColumns, forceNullable);
-
-		associationElement.addAttribute("unique", "true");
+
+		if (isEObject(specifiedName)) {
+			addColumns(associationElement, eref.getName(), getAnyTypeColumns(eref.getName(), true), true, false);
+		} else {
+			if (getHbmContext().isEasyEMFGenerated(eref.getEContainingClass())) {
+				addFetchType(associationElement, oto.getFetch());
+			} else {
+				associationElement.addAttribute("lazy", "false");
+			}
+			final List joinColumns = getJoinColumns(paReference);
+			final boolean forceNullable = (oto.isOptional() || getHbmContext().isCurrentElementFeatureMap());
+			addJoinColumns(associationElement, joinColumns, forceNullable);
+
+			associationElement.addAttribute("unique", "true");
+		}
 	}
 
 	/** Create hibernate one-to-one mapping */
@@ -115,12 +122,13 @@ class OneToOneMapper extends AbstractAssociationMapper {
 		final Element associationElement = addOneToOne(getHbmContext().getPropertyName(eref), targetName,
 				!isEasyEMFGenerated);
 
+		addCascadesForSingle(associationElement, oto.getCascade());
+
 		// add the other-side
 		if (otherSide != null) {
 			associationElement.addAttribute("property-ref", getHbmContext().getPropertyName(otherSide));
 		}
 
-		addCascadesForSingle(associationElement, oto.getCascade());
 		addFetchType(associationElement, oto.getFetch());
 		if (paReference.getPrimaryKeyJoinColumns().size() > 0) {
 			associationElement.addAttribute("constrained", "true");
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbDataStore.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbDataStore.java
index 0b9ba36da..79fb933aa 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbDataStore.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbDataStore.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: HbDataStore.java,v 1.10 2006/11/07 10:22:54 mtaal Exp $
+ * $Id: HbDataStore.java,v 1.11 2006/11/15 17:17:34 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate;
@@ -83,7 +83,7 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate;
  * HbDataStoreFactory in the HibernateHelper.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
  */
 
 public class HbDataStore {
@@ -540,7 +540,7 @@ public class HbDataStore {
 			hibResource.getContents().addAll(importResource.getContents());
 			hibResource.save(Collections.EMPTY_MAP);
 		} catch (IOException e) {
-			throw new HbMapperException("Exception when exporting " + name, e);
+			throw new HbMapperException("Exception when importing " + name, e);
 		}
 	}
 
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/AnyEObjectType.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/AnyEObjectType.java
new file mode 100644
index 000000000..22796719c
--- /dev/null
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/AnyEObjectType.java
@@ -0,0 +1,396 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Martin Taal
+ * </copyright>
+ *
+ * $Id: AnyEObjectType.java,v 1.1 2006/11/15 17:17:34 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.hibernate.mapping;
+
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.dom4j.Node;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.teneo.hibernate.HbStoreException;
+import org.hibernate.EntityMode;
+import org.hibernate.FetchMode;
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
+import org.hibernate.MappingException;
+import org.hibernate.engine.CascadeStyle;
+import org.hibernate.engine.ForeignKeys;
+import org.hibernate.engine.Mapping;
+import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.engine.SessionImplementor;
+import org.hibernate.persister.entity.Joinable;
+import org.hibernate.type.AbstractComponentType;
+import org.hibernate.type.AbstractType;
+import org.hibernate.type.AssociationType;
+import org.hibernate.type.ForeignKeyDirection;
+import org.hibernate.type.Type;
+
+/**
+ * Supports persisting the reference to any persistable EObect, it stores the entity name, and the id in a string field
+ * 
+ * @author <a href="mailto:mkanaley@tibco.com">Mike Kanaley</a>
+ */
+public class AnyEObjectType extends AbstractType implements AbstractComponentType, AssociationType {
+
+	private static final String[] PROPERTY_NAMES = new String[] { "class", "idtype", "idstr"};
+
+	private static final int[] SQL_TYPES = { Types.VARCHAR, Types.VARCHAR, Types.VARCHAR };
+
+	/** Constructor by id */
+	private final HashMap constructors = new HashMap();
+
+	/**
+	 * Return the types of the columns that this UserType will serialize into.
+	 * 
+	 * @return a single column of type VARCHAR.
+	 */
+	public int[] sqlTypes() {
+		return SQL_TYPES;
+	}
+
+	/** Just returns the value */
+	public Object deepCopy(Object value, EntityMode entityMode, SessionFactoryImplementor factory)
+			throws HibernateException {
+		return value;
+	}
+
+	/* See superclass */
+	public boolean isMethodOf(Method method) {
+		return false;
+	}
+
+	/** Checks using equals */
+	public boolean isSame(Object x, Object y, EntityMode entityMode) throws HibernateException {
+		if (x != null) {
+			return x.equals(y);
+		}
+		return x == y;
+	}
+
+	/** Compare is not implemented, returning 0 for now */
+	public int compare(Object x, Object y, EntityMode entityMode) {
+		return 0;
+	}
+
+	/** Return the column span */
+	public int getColumnSpan(Mapping session) throws MappingException {
+		return SQL_TYPES.length;
+	}
+
+	/** The name of the type */
+	public String getName() {
+		return "AnyEObject";
+	}
+
+	/** Return false for safety */
+	public boolean isMutable() {
+		return false;
+	}
+
+	/** Returns unsupportedexception */
+	public Object nullSafeGet(ResultSet rs, String name, SessionImplementor session, Object owner)
+			throws HibernateException, SQLException {
+		throw new UnsupportedOperationException("Type is a multicolumn type");
+	}
+
+	/** Returns the object from the resultset */
+	public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner)
+			throws HibernateException, SQLException {
+		final String entityName = rs.getString(names[0]);
+		if (rs.wasNull())
+			return null;
+		final String idType = rs.getString(names[1]);
+		if (rs.wasNull())
+			return null;
+		final String idStr = rs.getString(names[2]);
+		if (rs.wasNull())
+			return null;
+
+		return session.internalLoad(entityName, getId(idStr, idType), true, false);
+	}
+
+	/** Creates an id object of the correct type */
+	private Serializable getId(String idStr, String idType) {
+		try {
+			Constructor constructor = (Constructor) constructors.get(idType);
+			if (constructor == null) {
+				final Class idClass = this.getClass().getClassLoader().loadClass(idType);
+				constructor = idClass.getConstructor(new Class[] { String.class });
+			}
+			return (Serializable) constructor.newInstance(new Object[] { idStr });
+		} catch (Exception e) {
+			throw new HbStoreException("Could not create id type for " + idType + " and id " + idStr, e);
+		}
+	}
+
+	public Object hydrate(ResultSet rs, String[] names, SessionImplementor session, Object owner)
+			throws HibernateException, SQLException {
+		final String entityName = rs.getString(names[0]);
+		if (rs.wasNull())
+			return null;
+		final String idType = rs.getString(names[1]);
+		if (rs.wasNull())
+			return null;
+		final String idStr = rs.getString(names[2]);
+		if (rs.wasNull())
+			return null;
+
+		return new EObjectCacheEntry(entityName, getId(idStr, idType));
+	}
+
+	public Object resolve(Object value, SessionImplementor session, Object owner) throws HibernateException {
+		EObjectCacheEntry entry = (EObjectCacheEntry) value;
+		return session.internalLoad(entry.entityName, entry.id, true, false);
+	}
+
+	/*
+	 * public Object semiResolve(Object value, SessionImplementor session, Object owner) throws HibernateException {
+	 * throw new UnsupportedOperationException("Any mappings may not form part of a property-ref"); }
+	 */
+
+	public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session)
+			throws HibernateException, SQLException {
+		nullSafeSet(st, value, index, null, session);
+	}
+
+	public void nullSafeSet(PreparedStatement st, Object value, int index, boolean[] settable,
+			SessionImplementor session) throws HibernateException, SQLException {
+
+		String entityName = null;
+		String idStr = null;
+		String idType = null;
+		if (value != null) {
+			entityName = session.bestGuessEntityName(value);
+			Serializable id = ForeignKeys.getEntityIdentifierIfNotUnsaved(entityName, value, session);
+			idType = id.getClass().getName();
+			idStr = id.toString();
+			st.setString(index, entityName);
+			st.setString(index + 1, idType);
+			st.setString(index + 2, idStr);
+		} else {
+			st.setNull(index, SQL_TYPES[0]);
+			st.setNull(index, SQL_TYPES[1]);
+			st.setNull(index, SQL_TYPES[2]);
+		}
+	}
+
+	/** Returns EObject */
+	public Class getReturnedClass() {
+		return EObject.class;
+	}
+
+	public int[] sqlTypes(Mapping mapping) throws MappingException {
+		return SQL_TYPES;
+	}
+
+	public void setToXMLNode(Node xml, Object value, SessionFactoryImplementor factory) {
+		throw new UnsupportedOperationException("Any types cannot be stringified");
+	}
+
+	public String toLoggableString(Object value, SessionFactoryImplementor factory) throws HibernateException {
+		return value == null ? "null" : value.getClass().getName();
+	}
+
+	public Object fromXMLNode(Node xml, Mapping factory) throws HibernateException {
+		throw new UnsupportedOperationException(); // TODO: is this right??
+	}
+
+	public static final class EObjectCacheEntry implements Serializable {
+		/** The cached entityName */
+		String entityName;
+
+		/** And its id */
+		Serializable id;
+
+		EObjectCacheEntry(String entityName, Serializable id) {
+			this.entityName = entityName;
+			this.id = id;
+		}
+	}
+
+	public Object assemble(Serializable cached, SessionImplementor session, Object owner) throws HibernateException {
+		final EObjectCacheEntry entry = (EObjectCacheEntry) cached;
+		return entry == null ? null : session.internalLoad(entry.entityName, entry.id, true, false);
+	}
+
+	public Serializable disassemble(Object value, SessionImplementor session, Object owner) throws HibernateException {
+		if (value == null)
+			return null;
+		final String entityName = session.bestGuessEntityName(value);
+		final Serializable id = ForeignKeys.getEntityIdentifierIfNotUnsaved(entityName, value, session);
+		return new EObjectCacheEntry(entityName, id);
+	}
+
+	public boolean isAnyType() {
+		return true;
+	}
+
+	public Object replace(Object original, Object target, SessionImplementor session, Object owner, Map copyCache)
+			throws HibernateException {
+		if (original == null) {
+			return null;
+		} else {
+			final String entityName = session.bestGuessEntityName(original);
+			final Serializable id = ForeignKeys.getEntityIdentifierIfNotUnsaved(entityName, original, session);
+			return session.internalLoad(entityName, id, true, false);
+		}
+	}
+
+	public CascadeStyle getCascadeStyle(int i) {
+		return CascadeStyle.NONE;
+	}
+
+	public FetchMode getFetchMode(int i) {
+		return FetchMode.SELECT;
+	}
+
+	public String[] getPropertyNames() {
+		return PROPERTY_NAMES;
+	}
+
+	public Object getPropertyValue(Object component, int i, SessionImplementor session) throws HibernateException {
+		if (component != null) {
+			final String entityName = session.bestGuessEntityName(component);
+			Serializable id = ForeignKeys.getEntityIdentifierIfNotUnsaved(entityName, component, session);
+			switch (i) {
+			case 0: return session.bestGuessEntityName(component);
+			case 1: return id.getClass().getName();
+			case 2: return id.toString();
+			default:
+				throw new HbStoreException("Index " + i + "not supported");
+			}
+		}
+		return null;
+	}
+
+	public Object[] getPropertyValues(Object component, SessionImplementor session) throws HibernateException {
+		if (component != null) {
+			final String entityName = session.bestGuessEntityName(component);
+			Serializable id = ForeignKeys.getEntityIdentifierIfNotUnsaved(entityName, component, session);
+			return new Object[] {session.bestGuessEntityName(component), id.getClass().getName(),
+					id.toString()};
+		}
+		return null;
+	}
+
+	public Type[] getSubtypes() {
+		return new Type[] {Hibernate.STRING, Hibernate.STRING, Hibernate.STRING};
+	}
+
+	public void setPropertyValues(Object component, Object[] values, EntityMode entityMode) throws HibernateException {
+		throw new UnsupportedOperationException();
+	}
+
+	public Object[] getPropertyValues(Object component, EntityMode entityMode) {
+		throw new UnsupportedOperationException();
+	}
+
+	public boolean isComponentType() {
+		return true;
+	}
+
+	public ForeignKeyDirection getForeignKeyDirection() {
+		return ForeignKeyDirection.FOREIGN_KEY_FROM_PARENT;
+	}
+
+	public boolean isAssociationType() {
+		return true;
+	}
+
+	public boolean useLHSPrimaryKey() {
+		return false;
+	}
+
+	public Joinable getAssociatedJoinable(SessionFactoryImplementor factory) {
+		throw new UnsupportedOperationException("any types do not have a unique referenced persister");
+	}
+
+	public boolean isModified(Object old, Object current, boolean[] checkable, SessionImplementor session)
+			throws HibernateException {
+		if (current == null)
+			return old != null;
+		if (old == null)
+			return current != null;
+		
+		final EObjectCacheEntry entry = (EObjectCacheEntry)old;
+		final String entityName = session.bestGuessEntityName(current);
+		final Serializable id = ForeignKeys.getEntityIdentifierIfNotUnsaved(entityName, current, session);
+		if (checkable[0] && entry.entityName.compareTo(entityName) != 0) {
+			return true;
+		}
+		if ((checkable[1] || checkable[2]) && !id.equals(entry.id)) {
+			return true;
+		}
+		return false;
+	}
+
+	public String getAssociatedEntityName(SessionFactoryImplementor factory) throws MappingException {
+		throw new UnsupportedOperationException("any types do not have a unique referenced persister");
+	}
+
+	public boolean[] getPropertyNullability() {
+		return null;
+	}
+
+	public String getOnCondition(String alias, SessionFactoryImplementor factory, Map enabledFilters)
+			throws MappingException {
+		throw new UnsupportedOperationException();
+	}
+
+	public boolean isReferenceToPrimaryKey() {
+		return true;
+	}
+
+	public String getRHSUniqueKeyPropertyName() {
+		return null;
+	}
+
+	public String getLHSPropertyName() {
+		return null;
+	}
+
+	public boolean isAlwaysDirtyChecked() {
+		return false;
+	}
+
+	public boolean isEmbeddedInXML() {
+		return false;
+	}
+
+	public boolean[] toColumnNullness(Object value, Mapping mapping) {
+		boolean[] result = new boolean[getColumnSpan(mapping)];
+		if (value != null)
+			Arrays.fill(result, true);
+		return result;
+	}
+
+	public boolean isDirty(Object old, Object current, boolean[] checkable, SessionImplementor session)
+			throws HibernateException {
+		return isDirty(old, current, session);
+	}
+
+	public boolean isEmbedded() {
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/resource/HibernateResource.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/resource/HibernateResource.java
index 440472fa1..6b2b4a1f6 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/resource/HibernateResource.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/resource/HibernateResource.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: HibernateResource.java,v 1.3 2006/11/01 16:19:45 mtaal Exp $
+ * $Id: HibernateResource.java,v 1.4 2006/11/15 17:17:34 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.resource;
@@ -46,16 +46,18 @@ import org.hibernate.Transaction;
 import org.hibernate.impl.SessionImpl;
 
 /**
- * Hibernate Resource. The hibernate resource has a Session during its lifetime. A transaction is started before the load and it is
- * stopped just after the save. The session is disconnected and reconnected when loading and saving.
+ * Hibernate Resource. The hibernate resource has a Session during its lifetime. A transaction is started before the
+ * load and it is stopped just after the save. The session is disconnected and reconnected when loading and saving.
  * 
- * When you create a HbDataStore through the appropriate method in the HibernateHelper class. The name you passed there can be used as
- * a parameter in the uri used to create this resource (using the parameter pmfname). The uri is then: hibernate://?dsname=myemf.
+ * When you create a HbDataStore through the appropriate method in the HibernateHelper class. The name you passed there
+ * can be used as a parameter in the uri used to create this resource (using the parameter pmfname). The uri is then:
+ * hibernate://?dsname=myemf.
  * 
- * Another simple trick which is used to fool emf a bit is that the extension of the uri can also be used to init a hibernate resource!
+ * Another simple trick which is used to fool emf a bit is that the extension of the uri can also be used to init a
+ * hibernate resource!
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
  */
 
 public class HibernateResource extends StoreResource implements HbResource {
@@ -67,16 +69,16 @@ public class HibernateResource extends StoreResource implements HbResource {
 
 	/** The uri parameter under which to store a session controller */
 	public static String SESSION_CONTROLLER_PARAM = "sessionController";
-	
+
 	/** The session used for long transactions */
 	private Session session = null; // is opened at first load
 
 	/** The session controller */
 	private SessionController sessionController = null;
-	
+
 	/** Is set to true if there is a sessionController */
 	private boolean hasSessionController = false;
-	
+
 	/**
 	 * The constructor, gets an uri and retrieves the backing OJBStore
 	 */
@@ -87,10 +89,27 @@ public class HibernateResource extends StoreResource implements HbResource {
 
 		final HashMap params = decodeQueryString(uri.query());
 
-		if (uri.query() == null && uri.fileExtension() != null) // this is probably a platform uri!
+		if (params.get(DS_NAME_PARAM) != null) { // only the name
+			setDefinedQueries(getQueries(params));
+			emfDataStore = (HbDataStore) HbHelper.INSTANCE.getDataStore(getParam(params, DS_NAME_PARAM, uri.query()));
+		} else if (params.get(SESSION_CONTROLLER_PARAM) != null) {
+
+			setDefinedQueries(getQueries(params));
+
+			final String scName = getParam(params, SESSION_CONTROLLER_PARAM, uri.query());
+			sessionController = SessionController.getSessionController(scName);
+			log.debug("Using session controller " + scName);
+			emfDataStore = sessionController.getHbDataStore();
+			hasSessionController = true;
+		} else if (uri.fileExtension() != null) // this is probably a platform uri!
 		{
-			if (HbConstants.EHB_FILE_EXTENSION.compareTo(uri.fileExtension()) == 0) {
-				log.debug("Assuming this is a property file " + uri.toString());
+			log.debug("Trying fileextension: " + uri.fileExtension());
+			// then try the extension of the resource
+			emfDataStore = (HbDataStore) HbHelper.INSTANCE.getDataStore(uri.fileExtension());
+
+			// if null then assume that this is a properties file
+			if (emfDataStore == null) {
+				log.debug("No datastore defined for extension, assuming this is a property file " + uri.toString());
 				try {
 					final URIConverter uriConverter = getURIConverter();
 					final InputStream is = uriConverter.createInputStream(uri);
@@ -102,26 +121,11 @@ public class HibernateResource extends StoreResource implements HbResource {
 				} catch (IOException e) {
 					throw new HbMapperException("Exception when reading properties from: " + uri.toString(), e);
 				}
-			} else {
-				log.debug("Trying fileextension: " + uri.fileExtension());
-				// then try the extension of the resource
-				emfDataStore = (HbDataStore) HbHelper.INSTANCE.getDataStore(uri.fileExtension());
-			}
-		} else if (params.get(DS_NAME_PARAM) != null) // only the name
-		{
-			setDefinedQueries(getQueries(params));
-			emfDataStore = (HbDataStore) HbHelper.INSTANCE.getDataStore(getParam(params, DS_NAME_PARAM, uri.query()));
-		} else if (params.get(SESSION_CONTROLLER_PARAM) != null) {
-
-			setDefinedQueries(getQueries(params));
-			
-			final String scName = getParam(params, SESSION_CONTROLLER_PARAM, uri.query());
-			sessionController = SessionController.getSessionController(scName);
-			log.debug("Using session controller " + scName);
-			emfDataStore = sessionController.getHbDataStore();
-			hasSessionController = true;
+			} 
+		}
+		if (emfDataStore == null) {
+			throw new HbMapperException("No HbDataStore can be found using the uri " + uri.toString());
 		}
-
 		log.debug("Using emf data store using  " + emfDataStore.getName());
 		super.init(emfDataStore.getTopEntities());
 	}
@@ -132,15 +136,15 @@ public class HibernateResource extends StoreResource implements HbResource {
 	}
 
 	/**
-	 * Returns the session of this resource, if no session is set yet then creates it using the datastore. As a default the FlushMode
-	 * is set to Never.
+	 * Returns the session of this resource, if no session is set yet then creates it using the datastore. As a default
+	 * the FlushMode is set to Never.
 	 */
 	public Session getSession() {
 		if (session == null) {
 			if (hasSessionController) {
 				session = sessionController.getSession();
 			} else {
-				// session can be null when this is an xml import!		;
+				// session can be null when this is an xml import! ;
 				session = emfDataStore.getSessionFactory().openSession();
 				session.setFlushMode(FlushMode.NEVER);
 			}
@@ -152,22 +156,23 @@ public class HibernateResource extends StoreResource implements HbResource {
 	public void setSession(Session session) {
 		this.session = session;
 	}
-	
+
 	/** Returns the session, does nothing in this impl */
 	public void returnSession(Session theSession) {
 		// do nothing
 	}
 
 	/**
-	 * Returns an array of EObjects which refer to a certain EObject, note if the array is of length zero then no refering EObjects
-	 * where found.
+	 * Returns an array of EObjects which refer to a certain EObject, note if the array is of length zero then no
+	 * refering EObjects where found.
 	 */
 	public Object[] getCrossReferencers(EObject referedTo) {
 		Transaction tx = null;
 		boolean err = true;
 		final Session mySession = getSession();
 		try {
-			if (!hasSessionController) tx = mySession.beginTransaction();
+			if (!hasSessionController)
+				tx = mySession.beginTransaction();
 			final Object[] result = emfDataStore.getCrossReferencers(mySession, referedTo);
 			err = false;
 
@@ -178,7 +183,8 @@ public class HibernateResource extends StoreResource implements HbResource {
 		} finally {
 			if (!hasSessionController) {
 				if (err) {
-					if (tx != null) tx.rollback();
+					if (tx != null)
+						tx.rollback();
 					mySession.close();
 				} else {
 					tx.commit();
@@ -216,15 +222,16 @@ public class HibernateResource extends StoreResource implements HbResource {
 				final Object obj = removedEObjects.get(i);
 				if (IdentifierCacheHandler.getID(obj) != null) // persisted object
 				{
-					if (((InternalEObject)obj).eDirectResource() == null || 
-							((InternalEObject)obj).eDirectResource() == this) { 
+					if (((InternalEObject) obj).eDirectResource() == null
+							|| ((InternalEObject) obj).eDirectResource() == this) {
 						mySession.delete(obj);
 					}
 				}
 			}
 
 			// now flush everything
-			if (!hasSessionController) mySession.flush();
+			if (!hasSessionController)
+				mySession.flush();
 			err = false;
 		} catch (Exception e) {
 			e.printStackTrace(System.err);
@@ -232,7 +239,8 @@ public class HibernateResource extends StoreResource implements HbResource {
 		} finally {
 			if (!hasSessionController) {
 				if (err) {
-					if (tx != null) tx.rollback();
+					if (tx != null)
+						tx.rollback();
 					mySession.close();
 				} else {
 					tx.commit();
@@ -267,7 +275,8 @@ public class HibernateResource extends StoreResource implements HbResource {
 		} finally {
 			if (!hasSessionController) {
 				if (err) {
-					if (tx != null) tx.rollback();
+					if (tx != null)
+						tx.rollback();
 					mySession.close();
 				} else {
 					tx.commit();
@@ -277,26 +286,29 @@ public class HibernateResource extends StoreResource implements HbResource {
 	}
 
 	/**
-	 * Rollsback the transaction if any and clears different lists to start with an empty resource again. Note that the super.dounload
-	 * is not called because that clears the list resulting in all kinds of undesirable inverseremoves.
+	 * Rollsback the transaction if any and clears different lists to start with an empty resource again. Note that the
+	 * super.dounload is not called because that clears the list resulting in all kinds of undesirable inverseremoves.
 	 */
 	protected void doUnload() {
 		super.doUnload();
 
 		if (!hasSessionController) {
-			AssertUtil.assertTrue("Session must be disconnected in unload", !((SessionImpl) getSession()).isTransactionInProgress());
+			AssertUtil.assertTrue("Session must be disconnected in unload", !((SessionImpl) getSession())
+					.isTransactionInProgress());
 			log.debug("Doing unload, closing and nullifying session");
 			getSession().close();
 			setSession(null);
 		} else {
-			log.debug("Doing unload, has session controller, sessioncontroller is therefor responsible for session close");
+			log
+					.debug("Doing unload, has session controller, sessioncontroller is therefor responsible for session close");
 		}
 	}
 
 	/**
-	 * This method can be overridden to implement specific load behavior. Note that a transaction has already been started. The session
-	 * is passed as a parameter, this is the same session which can be retrieved using the getSession method. The read objects should
-	 * be returned in the list. Note that after this call the retrieved objects are put in the resource content.
+	 * This method can be overridden to implement specific load behavior. Note that a transaction has already been
+	 * started. The session is passed as a parameter, this is the same session which can be retrieved using the
+	 * getSession method. The read objects should be returned in the list. Note that after this call the retrieved
+	 * objects are put in the resource content.
 	 */
 	protected List loadFromStore(Session sess) {
 		if (definedQueriesPresent()) {
diff --git a/plugins/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/util/StoreUtil.java b/plugins/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/util/StoreUtil.java
index ec8d01b30..e694765ea 100644
--- a/plugins/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/util/StoreUtil.java
+++ b/plugins/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/util/StoreUtil.java
@@ -12,7 +12,7 @@
  *
  * </copyright>
  *
- * $Id: StoreUtil.java,v 1.6 2006/10/04 14:08:23 mtaal Exp $
+ * $Id: StoreUtil.java,v 1.7 2006/11/15 17:17:06 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.util;
@@ -42,6 +42,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.EPackage.Registry;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -56,11 +57,15 @@ import org.eclipse.emf.teneo.StoreException;
  * Contains different util methods.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
  */
 
 public class StoreUtil {
 
+	/** The EObject eclass */
+	public static EClass EOBJECT_ECLASS = (EClass)EcorePackage.eINSTANCE.getEClassifier("EObject");
+	public static String EOBJECT_ECLASS_URI = EcorePackage.eINSTANCE.getNsURI() + "/" + EOBJECT_ECLASS.getName();
+	
 	/** The logger */
 	private static Log log = LogFactory.getLog(StoreUtil.class);
 
@@ -94,6 +99,9 @@ public class StoreUtil {
 
 	/** Translates an ECLass to a string representation */
 	public static String getEClassURI(EClass eclass, String qualify) {
+		if (eclass == EOBJECT_ECLASS) {
+			return EOBJECT_ECLASS_URI;
+		}
 		if (qualify == null || qualify.compareTo(PersistenceOptions.QUALIFY_ENTITY_NAME_NO) == 0) {
 			return eclass.getName();
 		} else if (qualify.compareTo(PersistenceOptions.QUALIFY_ENTITY_NAME_NSPREFIX) == 0) {
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/extlibrary/ExtLibraryAction.java b/tests/org.eclipse.emf.teneo.commontest/src/extlibrary/ExtLibraryAction.java
index c79a44da1..484826583 100644
--- a/tests/org.eclipse.emf.teneo.commontest/src/extlibrary/ExtLibraryAction.java
+++ b/tests/org.eclipse.emf.teneo.commontest/src/extlibrary/ExtLibraryAction.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: ExtLibraryAction.java,v 1.4 2006/08/22 22:24:51 mtaal Exp $
+ * $Id: ExtLibraryAction.java,v 1.5 2006/11/15 17:17:48 mtaal Exp $
  */
 
 package extlibrary;
@@ -25,7 +25,7 @@ import org.eclipse.emf.teneo.test.stores.TestStore;
  * Tests the extlibrary
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  */
 public class ExtLibraryAction extends AbstractTestAction {
 	
@@ -38,7 +38,7 @@ public class ExtLibraryAction extends AbstractTestAction {
 
 	/** Test */
 	public void doAction(TestStore store) {
-		store.disableDrop();
+//		store.disableDrop();
 		
 		final ExtlibraryFactory factory = ExtlibraryFactory.eINSTANCE;
 		store.beginTransaction();
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/MindMapAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/MindMapAction.java
new file mode 100644
index 000000000..84204bb76
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/MindMapAction.java
@@ -0,0 +1,134 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Martin Taal
+ * </copyright>
+ *
+ * $Id: MindMapAction.java,v 1.1 2006/11/15 17:17:48 mtaal Exp $
+ */
+
+package org.eclipse.emf.teneo.test.emf.sample;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.eclipse.emf.ecore.xml.type.internal.XMLCalendar;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapFactory;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.MindmapPackage;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource;
+import org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic;
+import org.eclipse.emf.teneo.test.AbstractTestAction;
+import org.eclipse.emf.teneo.test.stores.TestStore;
+
+/**
+ * Tests the gmf mindmap example
+ * 
+ * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
+ * @version $Revision: 1.1 $
+ */
+public class MindMapAction extends AbstractTestAction {
+	
+	/**
+	 * Constructor for ClassHierarchyParsing.
+	 * 
+	 * @param arg0
+	 */
+	public MindMapAction() {
+		super(MindmapPackage.eINSTANCE);
+	}
+
+	/** Creates an item, an address and links them to a po. */
+	public void doAction(TestStore store) {
+		final MindmapFactory factory = MindmapFactory.eINSTANCE;
+		{
+			final Map map = factory.createMap();
+			map.setTitle("Persistency Discussions");
+			
+			final Resource res1 = factory.createResource();
+			res1.setEmail("mtaal@elver.org");
+			res1.setName("Martin Taal");
+			
+			final Resource res2 = factory.createResource();
+			res2.setEmail("test@elver.org");
+			res2.setName("Test Me");
+			
+			map.getResources().add(res1);
+			map.getResources().add(res2);
+			
+			map.getRootTopics().add(createTopic(map.getResources(), factory, "Teneo JPOX", 5));
+			map.getRootTopics().add(createTopic(new ArrayList(), factory, "Teneo Hibernate", 3));
+			
+			final Relationship rel = factory.createRelationship();
+			rel.setSource((Topic)map.getRootTopics().get(0));
+			rel.setTarget((Topic)map.getRootTopics().get(1));
+			rel.setType(RelationshipType.EXTENDS_LITERAL);
+			
+			map.getRelations().add(rel);
+			
+			store.beginTransaction();
+			store.store(map);
+			store.commitTransaction();
+		}
+		
+		{ 
+			store.beginTransaction();
+			Map map = (Map)store.getObject(Map.class);
+			assertEquals(2, map.getRootTopics().size());
+			checkTopic(map, (Topic)map.getRootTopics().get(0), "Teneo JPOX", 5);
+			checkTopic(map, (Topic)map.getRootTopics().get(1), "Teneo Hibernate", 3);
+			Relationship rs = (Relationship)map.getRelations().get(0);
+			assertEquals(rs.getSource(), map.getRootTopics().get(0));
+			assertEquals(rs.getTarget(), map.getRootTopics().get(1));
+			map.getRelations().remove(0);
+			map.getRootTopics().remove(1);
+			store.commitTransaction();
+		}
+		{
+			store.beginTransaction();
+			Map map = (Map)store.getObject(Map.class);
+			assertEquals(1, map.getRootTopics().size());
+			checkTopic(map, (Topic)map.getRootTopics().get(0), "Teneo JPOX", 5);
+			store.commitTransaction();
+		}
+	}
+
+	/** Create a default topic */
+	private Topic createTopic(List resources, MindmapFactory factory, String name, int level) {
+		final Topic topic = factory.createTopic();
+		topic.setEndDate(new XMLCalendar(new Date(), XMLCalendar.DATETIME));
+		topic.setStartDate(new Date());
+		topic.setName(name + level);
+		topic.setPriority(Priority.get(level));
+		topic.setPercentComplete((float)(level * 10.0 / 100.0));
+		topic.getResources().addAll(resources);
+		for (int i = 0; i < level; i++) {
+			topic.getSubtopics().add(createTopic(resources, factory, name + "_", level - 1));
+		}
+		return topic;
+	}
+
+	private void checkTopic(Map map, Topic topic, String name, int level) {
+		assertEquals(name + level, topic.getName());
+		assertEquals(level, topic.getSubtopics().size());
+		assertEquals(Priority.get(level), topic.getPriority());
+		assertEquals((float)(level * 10.0 / 100.0), topic.getPercentComplete(), 0.1f);
+		for (int i = 0; i < topic.getResources().size(); i++) {
+			assertEquals(topic.getResources().get(i), map.getResources().get(i));
+		}
+		for (int i = 0; i < level; i++) {
+			checkTopic(map, (Topic)topic.getSubtopics().get(i), name + "_", level - 1);
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/ProductAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/ProductAction.java
index 192e09d95..25edc3c3e 100644
--- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/ProductAction.java
+++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/ProductAction.java
@@ -11,13 +11,14 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: ProductAction.java,v 1.1 2006/07/04 22:12:15 mtaal Exp $
+ * $Id: ProductAction.java,v 1.2 2006/11/15 17:17:48 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.test.emf.sample;
 
 import java.util.Date;
 
+import org.eclipse.emf.teneo.samples.emf.sample.product.ClassificationType;
 import org.eclipse.emf.teneo.samples.emf.sample.product.ProductFactory;
 import org.eclipse.emf.teneo.samples.emf.sample.product.ProductPackage;
 import org.eclipse.emf.teneo.samples.emf.sample.product.ProductType;
@@ -27,52 +28,82 @@ import org.eclipse.emf.teneo.test.AbstractTestAction;
 import org.eclipse.emf.teneo.test.stores.TestStore;
 
 /**
- * Very simple emf test which tests a simple relation between a product and its supplier
- * and some primitive types (double and date). 
+ * Very simple emf test which tests a simple relation between a product and its supplier and some primitive types
+ * (double and date).
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.1 $ 
-*/
-public class ProductAction extends AbstractTestAction 
-{
-	public ProductAction() 
-	{
+ * @version $Revision: 1.2 $
+ */
+public class ProductAction extends AbstractTestAction {
+	public ProductAction() {
 		super(ProductPackage.eINSTANCE);
 	}
 
 	/** Creates a supplier, a product, relates then, saves and retrieves them again. */
-	public void doAction(TestStore store)
-	{
-    	{
-	        store.beginTransaction();
-	        
-	        final ProductFactory factory = ProductFactory.eINSTANCE;
-	        
-	        final SupplierType supplier = factory.createSupplierType();
-	        supplier.setName("supplier1");
-	        supplier.setNoOfEmployees(1);
-	        store.store(supplier);
-	        
-	        final ProductType product = factory.createProductType();
-	        product.setCode("product1");
-	        product.setCreatedOn(new Date());
-	        product.setId("productid1");
-	        product.setPrice(199.95);
-	        product.setSupplier(supplier);
-	        store.store(product);
-	        store.commitTransaction();
-    	}
-    	
-    	{
-    		store.beginTransaction();    		
-    		ProductTypeImpl result = (ProductTypeImpl)store.getObject(ProductType.class);
+	public void doAction(TestStore store) {
+		store.disableDrop();
+		{
+			store.beginTransaction();
+
+			final ProductFactory factory = ProductFactory.eINSTANCE;
+
+			final SupplierType supplier = factory.createSupplierType();
+			supplier.setName("supplier1");
+			supplier.setNoOfEmployees(1);
+			store.store(supplier);
+
+			final ProductType product = factory.createProductType();
+			product.setCode("product1");
+			product.setCreatedOn(new Date());
+			product.setId("productid1");
+			product.setPrice(199.95);
+			product.setSupplier(supplier);
+
+			ClassificationType c1 = factory.createClassificationType();
+			c1.setName("c1");
+			ClassificationType c2 = factory.createClassificationType();
+			c2.setName("c2");
+			ClassificationType c3 = factory.createClassificationType();
+			c3.setName("c3");
+
+			product.setAnyOne(c1);
+			product.getAnyList().add(c2);
+			product.getAnyList().add(c3);
+			product.getAnyList().add(supplier);
+
+			store.store(product);
+			store.commitTransaction();
+		}
+
+		{
+			store.beginTransaction();
+			ProductTypeImpl result = (ProductTypeImpl) store.getObject(ProductType.class);
 			assertTrue(result != null);
 			assertTrue(result.getCode().compareTo("product1") == 0);
 			assertTrue(result.getSupplier() != null);
 			assertEquals(199.95, result.getPrice(), 0.01);
-			assertTrue(result.getCreatedOn() instanceof Date);
 			assertTrue(result.getSupplier().getName().compareTo("supplier1") == 0);
-		    store.commitTransaction();
-    	}
-	}	
+
+			ClassificationType c1 = (ClassificationType) result.getAnyOne();
+			assertEquals("c1", c1.getName());
+
+			assertEquals("c2", ((ClassificationType) result.getAnyList().get(0)).getName());
+			assertEquals("c3", ((ClassificationType) result.getAnyList().get(1)).getName());
+			assertEquals(result.getSupplier(), result.getAnyList().get(2));
+			result.setAnyOne(result.getSupplier());
+			result.getAnyList().remove(0);
+			result.getAnyList().remove(1);
+			store.commitTransaction();
+		}
+
+		store.checkNumber(ClassificationType.class, 3);
+
+		{
+			store.beginTransaction();
+			ProductTypeImpl result = (ProductTypeImpl) store.getObject(ProductType.class);
+			assertEquals(1, result.getAnyList().size());
+			result.setAnyOne(null);
+			store.commitTransaction();
+		}
+	}
 }
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/schemaconstructs/EMapAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/schemaconstructs/EMapAction.java
index e4ff18393..48c4015e0 100644
--- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/schemaconstructs/EMapAction.java
+++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/schemaconstructs/EMapAction.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: EMapAction.java,v 1.2 2006/09/29 12:30:28 mtaal Exp $
+ * $Id: EMapAction.java,v 1.3 2006/11/15 17:17:48 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.test.emf.schemaconstructs;
@@ -35,7 +35,7 @@ import org.eclipse.emf.teneo.test.stores.TestStore;
  * Tests support for emaps.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  */
 public class EMapAction extends AbstractTestAction {
 	/**
@@ -49,7 +49,7 @@ public class EMapAction extends AbstractTestAction {
 
 	/** Creates an item, an address and links them to a po. */
 	public void doAction(TestStore store) {
-		store.disableDrop();
+//		store.disableDrop();
 		{
 			store.beginTransaction();
 			store.store(createTestSet("prefix1"));
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_a_o/hibernate.hbm.xml
index dde7f5e17..de1119340 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:29 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:45 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="IdentityID" abstract="false" lazy="false" discriminator-value="IdentityID" table="`identityid`">
 		<meta attribute="eclassName">IdentityID</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_s_o/hibernate.hbm.xml
index d42600322..59225d73f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:12 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:25 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`">
 		<meta attribute="eclassName">IdentityID</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml
index 7c69c034b..805205b7d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:30 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:45 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl" discriminator-value="Person" table="`person`">
 		<meta attribute="eclassName">Person</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml
index d86e4093e..099385049 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:13 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:26 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl" table="`person`">
 		<meta attribute="eclassName">Person</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml
index 90351d6ec..2899218e9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:27 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:43 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="nameType" class="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType"/>
 	<typedef name="usertype.PhoneNumber" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
@@ -23,11 +23,11 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="nameType" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="nameType">
 			<column not-null="false" unique="false" name="`first_name`"/>
 			<column not-null="false" unique="false" name="`last_name`"/>
 		</property>
-		<property name="numbers" type="intArrayType" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="numbers" lazy="false" insert="true" update="true" not-null="true" unique="false" type="intArrayType">
 			<column not-null="true" unique="false" name="`numbers`"/>
 		</property>
 		<list name="phoneNumbers" lazy="true" cascade="all,delete-orphan">
@@ -37,7 +37,7 @@
 			<list-index column="`person_phonenumbers_idx`"/>
 			<element type="usertype.PhoneNumber"/>
 		</list>
-		<property name="emergencyContact" type="usertype.PhoneNumber" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="emergencyContact" lazy="false" insert="true" update="true" not-null="false" unique="false" type="usertype.PhoneNumber">
 			<column not-null="false" unique="false" name="`emergencycontact`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml
index 8d3f04daf..f43fa1be7 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:07 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:18 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="nameType" class="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType"/>
 	<typedef name="usertype.PhoneNumber" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
@@ -22,11 +22,11 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="nameType" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="nameType">
 			<column not-null="false" unique="false" name="`first_name`"/>
 			<column not-null="false" unique="false" name="`last_name`"/>
 		</property>
-		<property name="numbers" type="intArrayType" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="numbers" lazy="false" insert="true" update="true" not-null="true" unique="false" type="intArrayType">
 			<column not-null="true" unique="false" name="`numbers`"/>
 		</property>
 		<list name="phoneNumbers" lazy="true" cascade="all,delete-orphan">
@@ -36,7 +36,7 @@
 			<list-index column="`person_phonenumbers_idx`"/>
 			<element type="usertype.PhoneNumber"/>
 		</list>
-		<property name="emergencyContact" type="usertype.PhoneNumber" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="emergencyContact" lazy="false" insert="true" update="true" not-null="false" unique="false" type="usertype.PhoneNumber">
 			<column not-null="false" unique="false" name="`emergencycontact`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/hibernate.hbm.xml
index 58b8472af..6398f2365 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:44 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:00 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Contacts" abstract="false" lazy="false" discriminator-value="Contacts" table="`contacts`">
 		<meta attribute="eclassName">Contacts</meta>
@@ -33,7 +33,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="phones" lazy="true" cascade="all,delete-orphan">
@@ -51,16 +51,16 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="office" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="office" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`office`"/>
 		</property>
-		<property name="mobile" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="mobile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`mobile`"/>
 		</property>
-		<property name="fax" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="fax" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`fax`"/>
 		</property>
-		<property name="home" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="home" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`home`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/hibernate.hbm.xml
index fca1eb4c0..79ff9b0ed 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:42 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:58 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Contacts" abstract="false" lazy="false" table="`contacts`">
 		<meta attribute="eclassName">Contacts</meta>
@@ -31,7 +31,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="phones" lazy="true" cascade="all,delete-orphan">
@@ -49,16 +49,16 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="office" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="office" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`office`"/>
 		</property>
-		<property name="mobile" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="mobile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`mobile`"/>
 		</property>
-		<property name="fax" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="fax" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`fax`"/>
 		</property>
-		<property name="home" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="home" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`home`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_a_o/hibernate.hbm.xml
index dd393891a..75fed6670 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:44 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:00 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="TestA" abstract="false" lazy="false" discriminator-value="TestA" table="`testa`">
 		<meta attribute="eclassName">TestA</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="code" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`code`"/>
 		</property>
 		<many-to-one name="testB" entity-name="TestB" cascade="all" lazy="false" insert="true" update="true" not-null="true">
@@ -32,7 +32,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="code" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`code`"/>
 		</property>
 	</class>
@@ -47,11 +47,15 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="code" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`code`"/>
 		</property>
-		<property name="myDate" type="serializable" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="myDate" lazy="false" insert="true" update="true" not-null="true" unique="false">
 			<column not-null="true" unique="false" name="`mydate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
 		<list name="testB" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_s_o/hibernate.hbm.xml
index 9765b8919..64e718435 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:42 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:57 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="TestA" abstract="false" lazy="false" table="`testa`">
 		<meta attribute="eclassName">TestA</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="code" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`code`"/>
 		</property>
 		<many-to-one name="testB" entity-name="TestB" cascade="all" lazy="false" insert="true" update="true" not-null="true">
@@ -30,7 +30,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="code" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`code`"/>
 		</property>
 	</class>
@@ -44,11 +44,15 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="code" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`code`"/>
 		</property>
-		<property name="myDate" type="serializable" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="myDate" lazy="false" insert="true" update="true" not-null="true" unique="false">
 			<column not-null="true" unique="false" name="`mydate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
 		<list name="testB" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_a_o/hibernate.hbm.xml
index 276318225..4ab0cdaf6 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:33 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:56 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Account" abstract="true" lazy="false" discriminator-value="Account" table="`account`">
 		<meta attribute="eclassName">Account</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -29,7 +29,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="account" lazy="true" cascade="all,delete-orphan">
@@ -51,7 +51,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<list name="accountGroup" lazy="true" cascade="all,delete-orphan">
@@ -106,7 +106,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="journalGroups" lazy="true" cascade="all,delete-orphan">
@@ -135,13 +135,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`description`"/>
 		</property>
-		<property name="date" type="timestamp" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="date" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
 			<column not-null="true" unique="false" name="`date`"/>
 		</property>
-		<property name="amount" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="amount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`amount`"/>
 		</property>
 		<many-to-one name="debitAccount" entity-name="Account" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true">
@@ -169,7 +169,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="debitReportGroup" entity-name="ReportGroup" cascade="all" lazy="false" insert="true" update="true" not-null="true">
@@ -190,7 +190,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="reportGroup" lazy="true" cascade="all,delete-orphan">
@@ -221,10 +221,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="rate" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="rate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`rate`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_s_o/hibernate.hbm.xml
index 7221c1775..bf5d3800f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:05 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:25 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Account" abstract="true" lazy="false" table="`account`">
 		<meta attribute="eclassName">Account</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -27,7 +27,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="account" lazy="true" cascade="all,delete-orphan">
@@ -48,7 +48,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<list name="accountGroup" lazy="true" cascade="all,delete-orphan">
@@ -105,7 +105,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="journalGroups" lazy="true" cascade="all,delete-orphan">
@@ -133,13 +133,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`description`"/>
 		</property>
-		<property name="date" type="timestamp" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="date" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
 			<column not-null="true" unique="false" name="`date`"/>
 		</property>
-		<property name="amount" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="amount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`amount`"/>
 		</property>
 		<many-to-one name="debitAccount" entity-name="Account" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true">
@@ -169,7 +169,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="debitReportGroup" entity-name="ReportGroup" cascade="all" lazy="false" insert="true" update="true" not-null="true">
@@ -189,7 +189,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="reportGroup" lazy="true" cascade="all,delete-orphan">
@@ -219,10 +219,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="rate" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="rate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`rate`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_a_o/hibernate.hbm.xml
index d133dc836..6e859082d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:32 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:54 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="CapacityEntry" abstract="false" lazy="false" discriminator-value="CapacityEntry" table="`capacityentry`">
 		<meta attribute="eclassName">CapacityEntry</meta>
@@ -14,10 +14,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="capacityEntryId" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="capacityEntryId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`capacityentryid`"/>
 		</property>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -35,16 +35,16 @@
 		<many-to-one name="workWeek" entity-name="WorkWeek" cascade="all" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`workweek_workweek_id`"/>
 		</many-to-one>
-		<property name="machineId" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="machineId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`machineid`"/>
 		</property>
-		<property name="machineSearchString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="machineSearchString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`machinesearchstring`"/>
 		</property>
-		<property name="multiplicity" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="multiplicity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`multiplicity`"/>
 		</property>
-		<property name="taskSearchString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="taskSearchString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`tasksearchstring`"/>
 		</property>
 	</class>
@@ -78,22 +78,30 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="article" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="article" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`article`"/>
 		</property>
-		<property name="dueTime" type="serializable" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="dueTime" lazy="false" insert="true" update="true" not-null="false" unique="false">
 			<column not-null="false" unique="false" name="`duetime`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
-		<property name="missingAmount" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="missingAmount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`missingamount`"/>
 		</property>
-		<property name="productionId" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="productionId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`productionid`"/>
 		</property>
-		<property name="startTime" type="serializable" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="startTime" lazy="false" insert="true" update="true" not-null="false" unique="false">
 			<column not-null="false" unique="false" name="`starttime`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
-		<property name="totalAmount" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="totalAmount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`totalamount`"/>
 		</property>
 	</class>
@@ -114,16 +122,16 @@
 		<many-to-one name="production" entity-name="Production" cascade="all" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`production_production_id`"/>
 		</many-to-one>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
-		<property name="taskId" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="taskId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`taskid`"/>
 		</property>
-		<property name="timePerPice" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="timePerPice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`timeperpice`"/>
 		</property>
-		<property name="timePerPreperation" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="timePerPreperation" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`timeperpreperation`"/>
 		</property>
 	</class>
@@ -138,13 +146,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="dayOfWeek" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="dayOfWeek" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`dayofweek`"/>
 		</property>
-		<property name="duration" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="duration" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`duration`"/>
 		</property>
-		<property name="startTime" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="startTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`starttime`"/>
 		</property>
 	</class>
@@ -166,7 +174,7 @@
 			<list-index column="`workweek_days_idx`"/>
 			<one-to-many entity-name="WorkDay"/>
 		</list>
-		<property name="workWeekId" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="workWeekId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`workweekid`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_s_o/hibernate.hbm.xml
index 0d756ce1e..54915f666 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:03 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:24 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="CapacityEntry" abstract="false" lazy="false" table="`capacityentry`">
 		<meta attribute="eclassName">CapacityEntry</meta>
@@ -13,10 +13,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="capacityEntryId" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="capacityEntryId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`capacityentryid`"/>
 		</property>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -33,16 +33,16 @@
 		<many-to-one name="workWeek" entity-name="WorkWeek" cascade="all" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`workweek_workweek_id`"/>
 		</many-to-one>
-		<property name="machineId" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="machineId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`machineid`"/>
 		</property>
-		<property name="machineSearchString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="machineSearchString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`machinesearchstring`"/>
 		</property>
-		<property name="multiplicity" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="multiplicity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`multiplicity`"/>
 		</property>
-		<property name="taskSearchString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="taskSearchString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`tasksearchstring`"/>
 		</property>
 	</class>
@@ -74,22 +74,30 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="article" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="article" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`article`"/>
 		</property>
-		<property name="dueTime" type="serializable" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="dueTime" lazy="false" insert="true" update="true" not-null="false" unique="false">
 			<column not-null="false" unique="false" name="`duetime`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
-		<property name="missingAmount" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="missingAmount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`missingamount`"/>
 		</property>
-		<property name="productionId" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="productionId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`productionid`"/>
 		</property>
-		<property name="startTime" type="serializable" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="startTime" lazy="false" insert="true" update="true" not-null="false" unique="false">
 			<column not-null="false" unique="false" name="`starttime`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
-		<property name="totalAmount" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="totalAmount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`totalamount`"/>
 		</property>
 	</class>
@@ -109,16 +117,16 @@
 		<many-to-one name="production" entity-name="Production" cascade="all" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`production_production_id`"/>
 		</many-to-one>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
-		<property name="taskId" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="taskId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`taskid`"/>
 		</property>
-		<property name="timePerPice" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="timePerPice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`timeperpice`"/>
 		</property>
-		<property name="timePerPreperation" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="timePerPreperation" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`timeperpreperation`"/>
 		</property>
 	</class>
@@ -132,13 +140,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="dayOfWeek" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="dayOfWeek" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`dayofweek`"/>
 		</property>
-		<property name="duration" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="duration" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`duration`"/>
 		</property>
-		<property name="startTime" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="startTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`starttime`"/>
 		</property>
 	</class>
@@ -159,7 +167,7 @@
 			<list-index column="`workweek_days_idx`"/>
 			<one-to-many entity-name="WorkDay"/>
 		</list>
-		<property name="workWeekId" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="workWeekId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`workweekid`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml
index f3451b8e4..929086f27 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:39 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:01 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="CatalogType" abstract="false" lazy="false" discriminator-value="CatalogType" table="`catalogtype`">
 		<meta attribute="eclassName">CatalogType</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`description`"/>
 		</property>
 		<list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh">
@@ -42,10 +42,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="price" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`price`"/>
 		</property>
-		<property name="quantityTo" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="quantityTo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`quantityto`"/>
 		</property>
 		<many-to-one name="supplier" entity-name="SupplierType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true">
@@ -62,7 +62,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`description`"/>
 		</property>
 		<list name="remark" lazy="true" cascade="all,delete-orphan">
@@ -87,7 +87,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="value" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`value`"/>
 		</property>
 	</class>
@@ -102,10 +102,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="noOfEmployees" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="noOfEmployees" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`noofemployees`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml
index ff58da59a..9d6a591d5 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:12 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:31 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="CatalogType" abstract="false" lazy="false" table="`catalogtype`">
 		<meta attribute="eclassName">CatalogType</meta>
@@ -12,7 +12,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`description`"/>
 		</property>
 		<list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh">
@@ -40,10 +40,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="price" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`price`"/>
 		</property>
-		<property name="quantityTo" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="quantityTo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`quantityto`"/>
 		</property>
 		<many-to-one name="supplier" entity-name="SupplierType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true">
@@ -59,7 +59,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`description`"/>
 		</property>
 		<list name="remark" lazy="true" cascade="all,delete-orphan">
@@ -83,7 +83,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="value" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`value`"/>
 		</property>
 	</class>
@@ -97,10 +97,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="noOfEmployees" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="noOfEmployees" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`noofemployees`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml
index b377b055e..9393df55b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:33 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:55 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -74,7 +74,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml
index c28eefdd1..a7e311fa7 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:04 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:25 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -17,10 +17,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -43,7 +43,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -71,7 +71,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/hibernate.hbm.xml
index 5d7c79ea7..257d38ba7 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:27 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:50 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`">
 		<meta attribute="eclassName">Item</meta>
@@ -17,22 +17,22 @@
 		<many-to-one name="order" entity-name="PurchaseOrder" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
 			<column not-null="false" unique="false" name="`item_order_id`"/>
 		</many-to-one>
-		<property name="productName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="productName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`productname`"/>
 		</property>
-		<property name="quantity" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`quantity`"/>
 		</property>
-		<property name="USPrice" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="USPrice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`usprice`"/>
 		</property>
-		<property name="comment" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`comment`"/>
 		</property>
-		<property name="shipDate" type="timestamp" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
 			<column not-null="false" unique="false" name="`shipdate`"/>
 		</property>
-		<property name="partNum" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="partNum" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`partnum`"/>
 		</property>
 	</class>
@@ -47,26 +47,26 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
-		<property name="country" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`country`"/>
 		</property>
 	</class>
 	<subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress">
 		<meta attribute="eclassName">USAddress</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/extendedpo2</meta>
-		<property name="street" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`street`"/>
 		</property>
-		<property name="city" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`city`"/>
 		</property>
-		<property name="state" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`state`"/>
 		</property>
-		<property name="zip" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`zip`"/>
 		</property>
 	</subclass>
@@ -94,10 +94,10 @@
 		<many-to-one name="shipTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_shipto_id`"/>
 		</many-to-one>
-		<property name="comment" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`comment`"/>
 		</property>
-		<property name="orderDate" type="timestamp" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="orderDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
 			<column not-null="false" unique="false" name="`orderdate`"/>
 		</property>
 		<property name="status" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -124,7 +124,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<list name="customers" lazy="true" cascade="all,delete-orphan">
@@ -153,7 +153,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="customerID" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="customerID" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`customerid`"/>
 		</property>
 		<list name="orders" lazy="true" cascade="merge,persist,save-update,lock,refresh">
@@ -167,7 +167,7 @@
 	<subclass entity-name="GlobalAddress" abstract="false" lazy="false" extends="Address" discriminator-value="GlobalAddress">
 		<meta attribute="eclassName">GlobalAddress</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/extendedpo2</meta>
-		<property name="countryCode" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="countryCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`countrycode`"/>
 		</property>
 		<list name="location" lazy="true" cascade="all,delete-orphan">
@@ -189,7 +189,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="countryCode" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="countryCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`countrycode`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/hibernate.hbm.xml
index dbf20299d..1196c2684 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:59 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:20 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" table="`item`">
 		<meta attribute="eclassName">Item</meta>
@@ -16,22 +16,22 @@
 		<many-to-one name="order" entity-name="PurchaseOrder" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
 			<column not-null="false" unique="false" name="`item_order_id`"/>
 		</many-to-one>
-		<property name="productName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="productName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`productname`"/>
 		</property>
-		<property name="quantity" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`quantity`"/>
 		</property>
-		<property name="USPrice" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="USPrice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`usprice`"/>
 		</property>
-		<property name="comment" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`comment`"/>
 		</property>
-		<property name="shipDate" type="timestamp" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
 			<column not-null="false" unique="false" name="`shipdate`"/>
 		</property>
-		<property name="partNum" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="partNum" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`partnum`"/>
 		</property>
 	</class>
@@ -45,10 +45,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
-		<property name="country" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`country`"/>
 		</property>
 	</class>
@@ -58,16 +58,16 @@
 		<key>
 			<column name="`address_id`"/>
 		</key>
-		<property name="street" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`street`"/>
 		</property>
-		<property name="city" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`city`"/>
 		</property>
-		<property name="state" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`state`"/>
 		</property>
-		<property name="zip" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`zip`"/>
 		</property>
 	</joined-subclass>
@@ -94,10 +94,10 @@
 		<many-to-one name="shipTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_shipto_id`"/>
 		</many-to-one>
-		<property name="comment" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`comment`"/>
 		</property>
-		<property name="orderDate" type="timestamp" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="orderDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
 			<column not-null="false" unique="false" name="`orderdate`"/>
 		</property>
 		<property name="status" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -123,7 +123,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<list name="customers" lazy="true" cascade="all,delete-orphan">
@@ -151,7 +151,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="customerID" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="customerID" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`customerid`"/>
 		</property>
 		<list name="orders" lazy="true" cascade="merge,persist,save-update,lock,refresh">
@@ -168,7 +168,7 @@
 		<key>
 			<column name="`address_id`"/>
 		</key>
-		<property name="countryCode" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="countryCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`countrycode`"/>
 		</property>
 		<list name="location" lazy="true" cascade="all,delete-orphan">
@@ -189,7 +189,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="countryCode" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="countryCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`countrycode`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_a_o/hibernate.hbm.xml
index 7b7d524b6..988d1cd72 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:26 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:49 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -74,7 +74,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_s_o/hibernate.hbm.xml
index 27331c5ab..9a84868a4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:58 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:19 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -17,10 +17,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -43,7 +43,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -71,7 +71,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml
index a946c5fe7..cc4c636da 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:38 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:59 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -19,10 +19,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -47,7 +47,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -79,7 +79,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml
index aa0b1e543..02480605f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:11 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:30 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -76,7 +76,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml
index b4133c470..cda719439 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:41 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:07 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -74,7 +74,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml
index 102fded6d..1b983cd83 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:16 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:35 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -17,10 +17,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -43,7 +43,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -71,7 +71,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/hibernate.hbm.xml
index 77aeacd3d..1bc575042 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:38 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:59 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<meta attribute="eclassName">Book</meta>
@@ -14,10 +14,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -41,7 +41,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -70,7 +70,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
@@ -92,21 +92,21 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="value" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
 	</class>
 	<subclass entity-name="SchoolBook" abstract="false" lazy="false" extends="Book" discriminator-value="SchoolBook">
 		<meta attribute="eclassName">SchoolBook</meta>
 		<meta attribute="epackage">http:///org/elver/store/test/emf/sample/schoollibrary/schoollibrary.ecore</meta>
-		<property name="value" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
 	</subclass>
 	<subclass entity-name="SchoolLibrary" abstract="false" lazy="false" extends="Library" discriminator-value="SchoolLibrary">
 		<meta attribute="eclassName">SchoolLibrary</meta>
 		<meta attribute="epackage">http:///org/elver/store/test/emf/sample/schoollibrary/schoollibrary.ecore</meta>
-		<property name="location" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="location" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`location`"/>
 		</property>
 	</subclass>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/hibernate.hbm.xml
index 77aacac15..bfe1b16ed 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:11 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:30 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
 		<meta attribute="eclassName">Book</meta>
@@ -13,10 +13,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -39,7 +39,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -67,7 +67,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
@@ -88,7 +88,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="value" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
 	</class>
@@ -98,7 +98,7 @@
 		<key>
 			<column name="`book_id`"/>
 		</key>
-		<property name="value" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
 	</joined-subclass>
@@ -108,7 +108,7 @@
 		<key>
 			<column name="`library_id`"/>
 		</key>
-		<property name="location" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="location" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`location`"/>
 		</property>
 	</joined-subclass>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml
index 5eada4061..a0136f567 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:00 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:26 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="A" abstract="false" lazy="false" discriminator-value="A" table="`a`">
 		<meta attribute="eclassName">A</meta>
@@ -13,19 +13,19 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
-		<property name="b" type="long" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="b" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`b`"/>
 		</property>
-		<property name="c" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="c" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`c`"/>
 		</property>
-		<property name="comment" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`comment`"/>
 		</property>
-		<property name="d" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="d" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`d`"/>
 		</property>
 		<many-to-one name="myR" entity-name="R" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
@@ -43,7 +43,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml
index e997693f3..aefd85969 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:50 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:16 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="A" abstract="false" lazy="false" table="`a`">
 		<meta attribute="eclassName">A</meta>
@@ -12,19 +12,19 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
-		<property name="b" type="long" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="b" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`b`"/>
 		</property>
-		<property name="c" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="c" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`c`"/>
 		</property>
-		<property name="comment" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`comment`"/>
 		</property>
-		<property name="d" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="d" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`d`"/>
 		</property>
 		<many-to-one name="myR" entity-name="R" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
@@ -41,7 +41,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_a_o/hibernate.hbm.xml
index 2274a3fd7..fcf0d0881 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:35 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:51 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
 		<meta attribute="eclassName">Address</meta>
@@ -14,10 +14,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="street" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`street`"/>
 		</property>
-		<property name="postalCode" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="postalCode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`postalcode`"/>
 		</property>
 	</class>
@@ -31,13 +31,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="address" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`employee_address_id`"/>
 		</many-to-one>
-		<property name="department" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`department`"/>
 		</property>
 	</class>
@@ -51,13 +51,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="address" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_address_id`"/>
 		</many-to-one>
-		<property name="faculty" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="faculty" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`faculty`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_s_o/hibernate.hbm.xml
index ba8b4087a..e853d88e2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:21 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:37 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="false" lazy="false" table="`address`">
 		<meta attribute="eclassName">Address</meta>
@@ -13,10 +13,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="street" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`street`"/>
 		</property>
-		<property name="postalCode" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="postalCode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`postalcode`"/>
 		</property>
 	</class>
@@ -29,13 +29,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="address" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`employee_address_id`"/>
 		</many-to-one>
-		<property name="department" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`department`"/>
 		</property>
 	</class>
@@ -48,13 +48,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="address" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_address_id`"/>
 		</many-to-one>
-		<property name="faculty" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="faculty" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`faculty`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_a_o/hibernate.hbm.xml
index bc8db6d15..ee7322cf0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:41 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:56 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
 		<meta attribute="eclassName">Person</meta>
@@ -14,22 +14,22 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<component name="bornIn" class="City">
-			<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`bornnamecolumn`"/>
 			</property>
-			<property name="country" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`bornin_country`"/>
 			</property>
 		</component>
 		<component name="livesIn" class="City">
-			<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`namecolumn`"/>
 			</property>
-			<property name="country" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`countrycolumn`"/>
 			</property>
 		</component>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_s_o/hibernate.hbm.xml
index e18725d44..fc6aa6756 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:26 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:43 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" table="`person`">
 		<meta attribute="eclassName">Person</meta>
@@ -13,22 +13,22 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<component name="bornIn" class="City">
-			<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`bornnamecolumn`"/>
 			</property>
-			<property name="country" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`bornin_country`"/>
 			</property>
 		</component>
 		<component name="livesIn" class="City">
-			<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`namecolumn`"/>
 			</property>
-			<property name="country" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`countrycolumn`"/>
 			</property>
 		</component>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/hibernate.hbm.xml
index d70cf5b6a..5dd77da9b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:37 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:53 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Basic" abstract="false" lazy="false" discriminator-value="Basic" table="`basic`">
 		<meta attribute="eclassName">Basic</meta>
@@ -14,7 +14,7 @@
 		<version name="myVersion" type="long">
 			<column not-null="true" unique="false" name="`myversion`"/>
 		</version>
-		<property name="myOptionalBasic" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="myOptionalBasic" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`myoptionalbasic`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/hibernate.hbm.xml
index ae6a5c896..80ae89616 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:22 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:39 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Basic" abstract="false" lazy="false" table="`basic`">
 		<meta attribute="eclassName">Basic</meta>
@@ -13,7 +13,7 @@
 		<version name="myVersion" type="long">
 			<column not-null="true" unique="false" name="`myversion`"/>
 		</version>
-		<property name="myOptionalBasic" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="myOptionalBasic" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`myoptionalbasic`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/hibernate.hbm.xml
index afced3480..642f8998d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:32 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:48 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`">
 		<meta attribute="eclassName">Book</meta>
@@ -14,16 +14,16 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="true">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="true" type="java.lang.String">
 			<column not-null="false" unique="true" name="`titel`" length="25"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="false" update="false" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
-		<property name="weight" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="weight" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
 			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
 		</property>
-		<property name="author" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`author`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/hibernate.hbm.xml
index ac1955e4d..22e399a38 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:17 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:31 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`mybooktable`">
 		<meta attribute="eclassName">Book</meta>
@@ -13,16 +13,16 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="true">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="true" type="java.lang.String">
 			<column not-null="false" unique="true" name="`titel`" length="25"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="false" update="false" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
-		<property name="weight" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="weight" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
 			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
 		</property>
-		<property name="author" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`author`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml
index f7218ecf2..9fe0f1fba 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:38 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:53 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="cascadenotall.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
@@ -74,7 +74,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml
index e8428b220..1a302ab10 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:24 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:39 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="cascadenotall.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
@@ -17,10 +17,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -43,7 +43,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
@@ -71,7 +71,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml
index 0a68c7724..7b427e7bb 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:39 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:54 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.PersonImpl" discriminator-value="Person" table="`person`">
 		<meta attribute="eclassName">Person</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml
index c77b8fc93..fc7dfc87f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:24 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:40 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.PersonImpl" table="`person`">
 		<meta attribute="eclassName">Person</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/hibernate.hbm.xml
index f1440f71f..27813fbaf 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:30 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:46 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ChildItem" abstract="false" lazy="false" discriminator-value="ChildItem" table="`childitem`">
 		<meta attribute="eclassName">ChildItem</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -29,7 +29,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="childItem" lazy="true" cascade="all,delete-orphan">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/hibernate.hbm.xml
index 0d5559d5e..d4c9765e5 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:14 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:27 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ChildItem" abstract="false" lazy="false" table="`childitem`">
 		<meta attribute="eclassName">ChildItem</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -27,7 +27,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="childItem" lazy="true" cascade="all,delete-orphan">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o/hibernate.hbm.xml
index 9e39f3929..0b1147ce0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:33 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:48 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`">
 		<meta attribute="eclassName">Book</meta>
@@ -14,16 +14,16 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="true">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="true" type="java.lang.String">
 			<column not-null="false" unique="true" name="`titel`" length="25"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="false" update="false" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
-		<property name="weight" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="weight" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
 			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
 		</property>
-		<property name="author" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`author`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o/hibernate.hbm.xml
index 87b9940df..55780f066 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:17 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:31 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`mybooktable`">
 		<meta attribute="eclassName">Book</meta>
@@ -13,16 +13,16 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="true">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="true" type="java.lang.String">
 			<column not-null="false" unique="true" name="`titel`" length="25"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="false" update="false" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
-		<property name="weight" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="weight" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
 			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
 		</property>
-		<property name="author" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`author`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_a_o/hibernate.hbm.xml
index b580cc2ae..b28bb7c9f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:39 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:55 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Embedder" abstract="false" lazy="false" discriminator-value="Embedder" table="`embedder`">
 		<meta attribute="eclassName">Embedder</meta>
@@ -15,26 +15,26 @@
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
 		<component name="firstEmbedded" class="Embeddable">
-			<property name="myString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`columnstring3`"/>
 			</property>
-			<property name="myInteger" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 				<column not-null="false" unique="false" name="`firstembedded_myinteger`"/>
 			</property>
 		</component>
 		<component name="secondEmbedded" class="Embeddable">
-			<property name="myString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`columnstring1`"/>
 			</property>
-			<property name="myInteger" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 				<column not-null="false" unique="false" name="`columninteger1`"/>
 			</property>
 		</component>
 		<component name="thirdEmbedded" class="Embeddable">
-			<property name="myString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`columnstring2`"/>
 			</property>
-			<property name="myInteger" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 				<column not-null="false" unique="false" name="`columninteger2`"/>
 			</property>
 		</component>
@@ -44,19 +44,19 @@
 			</key>
 			<list-index column="`embedder_fourthembedded_idx`"/>
 			<composite-element class="Embeddable">
-				<property name="myString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+				<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 					<column not-null="true" unique="false" name="`mystring`"/>
 				</property>
-				<property name="myInteger" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+				<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 					<column not-null="false" unique="false" name="`myinteger`"/>
 				</property>
 			</composite-element>
 		</list>
 		<component name="fifthEmbedded" class="Embeddable">
-			<property name="myString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 				<column not-null="true" unique="false" name="`fifthembedded_mystring`"/>
 			</property>
-			<property name="myInteger" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 				<column not-null="false" unique="false" name="`fifthembedded_myinteger`"/>
 			</property>
 		</component>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_s_o/hibernate.hbm.xml
index c8944ff59..cfb5701ca 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:25 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:41 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Embedder" abstract="false" lazy="false" table="`embedder`">
 		<meta attribute="eclassName">Embedder</meta>
@@ -14,26 +14,26 @@
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
 		<component name="firstEmbedded" class="Embeddable">
-			<property name="myString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`columnstring3`"/>
 			</property>
-			<property name="myInteger" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 				<column not-null="false" unique="false" name="`firstembedded_myinteger`"/>
 			</property>
 		</component>
 		<component name="secondEmbedded" class="Embeddable">
-			<property name="myString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`columnstring1`"/>
 			</property>
-			<property name="myInteger" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 				<column not-null="false" unique="false" name="`columninteger1`"/>
 			</property>
 		</component>
 		<component name="thirdEmbedded" class="Embeddable">
-			<property name="myString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`columnstring2`"/>
 			</property>
-			<property name="myInteger" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 				<column not-null="false" unique="false" name="`columninteger2`"/>
 			</property>
 		</component>
@@ -43,19 +43,19 @@
 			</key>
 			<list-index column="`embedder_fourthembedded_idx`"/>
 			<composite-element class="Embeddable">
-				<property name="myString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+				<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 					<column not-null="true" unique="false" name="`mystring`"/>
 				</property>
-				<property name="myInteger" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+				<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 					<column not-null="false" unique="false" name="`myinteger`"/>
 				</property>
 			</composite-element>
 		</list>
 		<component name="fifthEmbedded" class="Embeddable">
-			<property name="myString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 				<column not-null="true" unique="false" name="`fifthembedded_mystring`"/>
 			</property>
-			<property name="myInteger" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 				<column not-null="false" unique="false" name="`fifthembedded_myinteger`"/>
 			</property>
 		</component>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml
index 534a98e0f..4d4cb9537 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:41 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:57 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" discriminator-value="Person" table="`person`">
 		<meta attribute="eclassName">Person</meta>
@@ -18,7 +18,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="address" type="text" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`address`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml
index 6c912614f..c5316fdd2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:27 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:43 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" table="`person`">
 		<meta attribute="eclassName">Person</meta>
@@ -17,7 +17,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="address" type="text" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`address`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/hibernate.hbm.xml
index 7023433a9..ae0fef494 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:30 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:45 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="IdentityID" abstract="false" lazy="false" discriminator-value="IdentityID" table="`identityid`">
 		<meta attribute="eclassName">IdentityID</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml
index 938b1f434..94eddd949 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:13 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:26 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`">
 		<meta attribute="eclassName">IdentityID</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_a_o/hibernate.hbm.xml
index e861507ce..17d3b270d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:29 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:45 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="User" abstract="false" lazy="false" discriminator-value="User" table="`user`">
 		<meta attribute="eclassName">User</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<idbag name="roles" lazy="true" cascade="all,delete-orphan">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_s_o/hibernate.hbm.xml
index f0e9d26c9..eaa5f3a3d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:12 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:25 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="User" abstract="false" lazy="false" table="`user`">
 		<meta attribute="eclassName">User</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<idbag name="roles" lazy="true" cascade="all,delete-orphan">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml
index 6eb2cf824..213a47b87 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:31 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:47 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
@@ -16,10 +16,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="street" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`street`"/>
 		</property>
-		<property name="city" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`city`"/>
 		</property>
 	</class>
@@ -54,7 +54,7 @@
 		<key>
 			<column name="`address_name`"/>
 		</key>
-		<property name="postcode" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`postcode`"/>
 		</property>
 	</joined-subclass>
@@ -64,7 +64,7 @@
 		<key>
 			<column name="`ukaddress_name`"/>
 		</key>
-		<property name="district" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`district`"/>
 		</property>
 	</joined-subclass>
@@ -79,17 +79,17 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="value" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
 			<column not-null="true" unique="false" name="`value`"/>
 		</property>
 	</class>
 	<subclass entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
 		<meta attribute="eclassName">InternationalPrice</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<property name="currency" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`currency`"/>
 		</property>
 	</subclass>
@@ -105,7 +105,7 @@
 				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
 			</type>
 		</property>
-		<property name="zip" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`zip`"/>
 		</property>
 	</joined-subclass>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml
index 23448b387..c46f0a191 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:15 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:29 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
@@ -16,10 +16,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="street" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`street`"/>
 		</property>
-		<property name="city" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`city`"/>
 		</property>
 	</class>
@@ -53,7 +53,7 @@
 		<key>
 			<column name="`address_name`"/>
 		</key>
-		<property name="postcode" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`postcode`"/>
 		</property>
 	</joined-subclass>
@@ -63,7 +63,7 @@
 		<key>
 			<column name="`ukaddress_name`"/>
 		</key>
-		<property name="district" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`district`"/>
 		</property>
 	</joined-subclass>
@@ -78,17 +78,17 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="value" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
 			<column not-null="true" unique="false" name="`value`"/>
 		</property>
 	</class>
 	<subclass entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
 		<meta attribute="eclassName">InternationalPrice</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<property name="currency" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`currency`"/>
 		</property>
 	</subclass>
@@ -104,7 +104,7 @@
 				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
 			</type>
 		</property>
-		<property name="zip" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`zip`"/>
 		</property>
 	</joined-subclass>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml
index 9dfc968db..73009729a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:32 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:47 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="lazy.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="false" cascade="all,delete-orphan">
@@ -74,7 +74,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml
index 6c2b63b1d..83156702b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:16 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:30 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="lazy.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param>
@@ -17,10 +17,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -43,7 +43,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="false" cascade="all,delete-orphan">
@@ -71,7 +71,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/hibernate.hbm.xml
index ae2c340a5..c10e59d91 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:41 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:56 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
 		<meta attribute="eclassName">Person</meta>
@@ -14,16 +14,16 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="id" type="long" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`id`"/>
 		</property>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="address" type="text" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`address`"/>
 		</property>
-		<property name="photo" type="binary" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte[]">
 			<column not-null="false" unique="false" name="`photo`" length="1000000"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/hibernate.hbm.xml
index 71c5ecace..7f3441ba1 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:27 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:43 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" table="`person`">
 		<meta attribute="eclassName">Person</meta>
@@ -13,16 +13,16 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="id" type="long" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`id`"/>
 		</property>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="address" type="text" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`address`"/>
 		</property>
-		<property name="photo" type="binary" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte[]">
 			<column not-null="false" unique="false" name="`photo`" length="1000000"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/hibernate.hbm.xml
index 7c51b70ec..94f95fda0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:34 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:49 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Cntr" abstract="false" lazy="false" discriminator-value="Cntr" table="`cntr`">
 		<meta attribute="eclassName">Cntr</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/hibernate.hbm.xml
index 37573838a..0da2b7c65 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:20 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:34 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Cntr" abstract="false" lazy="false" table="`cntr`">
 		<meta attribute="eclassName">Cntr</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/hibernate.hbm.xml
index c4d3379b6..d66f1b795 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:27 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:43 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="AddIDDocument" abstract="false" lazy="false" discriminator-value="AddIDDocument" table="`addiddocument`">
 		<meta attribute="eclassName">AddIDDocument</meta>
@@ -14,10 +14,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="myGenericInfo" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`mygenericinfo`"/>
 		</property>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -32,13 +32,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="myName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="myName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`myname`"/>
 		</property>
-		<property name="myGenericInfo" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`mygenericinfo`"/>
 		</property>
-		<property name="mySpecificInfo" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="mySpecificInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`myspecificinfo`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/hibernate.hbm.xml
index 3b378bfa1..9c9b661c3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:10 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:22 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="AddIDDocument" abstract="false" lazy="false" table="`addiddocument`">
 		<meta attribute="eclassName">AddIDDocument</meta>
@@ -13,10 +13,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="myGenericInfo" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`mygenericinfo`"/>
 		</property>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -30,13 +30,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="myName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="myName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`myname`"/>
 		</property>
-		<property name="myGenericInfo" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`mygenericinfo`"/>
 		</property>
-		<property name="mySpecificInfo" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="mySpecificInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`myspecificinfo`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml
index e492e569c..c930aac8f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:39 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:54 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`">
 		<meta attribute="eclassName">Body</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml
index dba2a24db..ae417701d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:25 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:41 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Body" abstract="false" lazy="false" table="`body`">
 		<meta attribute="eclassName">Body</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml
index 9d1a3cb8b..485b34d99 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:33 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:49 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`PERSON`">
 		<meta attribute="eclassName">Person</meta>
@@ -13,18 +13,18 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<join table="`PERSON_ADDRESS`">
 			<key column="`ID`"/>
-			<property name="address" type="text" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`ADDRESS`"/>
 			</property>
 		</join>
 		<join table="`PERSON_PHOTO`">
 			<key column="`ID`"/>
-			<property name="photo" type="binary" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte[]">
 				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
 			</property>
 		</join>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml
index 32e153d4a..2a76a6c06 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:19 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:32 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" table="`PERSON`">
 		<meta attribute="eclassName">Person</meta>
@@ -12,18 +12,18 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<join table="`PERSON_ADDRESS`">
 			<key column="`ID`"/>
-			<property name="address" type="text" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 				<column not-null="false" unique="false" name="`ADDRESS`"/>
 			</property>
 		</join>
 		<join table="`PERSON_PHOTO`">
 			<key column="`ID`"/>
-			<property name="photo" type="binary" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte[]">
 				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
 			</property>
 		</join>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/hibernate.hbm.xml
index 3adb74a90..824cc9217 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:36 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:51 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ContainedItem" abstract="false" lazy="false" discriminator-value="ContainedItem" table="`containeditem`">
 		<meta attribute="eclassName">ContainedItem</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -29,7 +29,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
@@ -47,7 +47,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/hibernate.hbm.xml
index 0ba3746e3..5da815f04 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:22 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:37 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ContainedItem" abstract="false" lazy="false" table="`containeditem`">
 		<meta attribute="eclassName">ContainedItem</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -27,7 +27,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
@@ -44,7 +44,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/hibernate.hbm.xml
index c77c67747..1109337a6 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:40 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:56 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="MyItem" abstract="false" lazy="false" discriminator-value="MyItem" table="`myitem`">
 		<meta attribute="eclassName">MyItem</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<bag name="yourItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="youritem_myitem">
@@ -37,7 +37,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<bag name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="youritem_myitem">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/hibernate.hbm.xml
index 5dccd8523..bfeed71b5 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:26 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:42 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="MyItem" abstract="false" lazy="false" table="`myitem`">
 		<meta attribute="eclassName">MyItem</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<bag name="yourItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="youritem_myitem">
@@ -35,7 +35,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<bag name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="youritem_myitem">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/hibernate.hbm.xml
index 72a745d03..a7fa19864 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:40 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:55 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ContainedItem" abstract="false" lazy="false" discriminator-value="ContainedItem" table="`containeditem`">
 		<meta attribute="eclassName">ContainedItem</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -29,7 +29,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
@@ -47,7 +47,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/hibernate.hbm.xml
index e0a23481f..095bd9785 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:25 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:41 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ContainedItem" abstract="false" lazy="false" table="`containeditem`">
 		<meta attribute="eclassName">ContainedItem</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -27,7 +27,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
@@ -44,7 +44,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/hibernate.hbm.xml
index c7374d8b7..38ebbe643 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:28 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:44 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
 		<meta attribute="eclassName">Address</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="city" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`city`"/>
 		</property>
 	</class>
@@ -29,7 +29,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="hairColor" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`haircolor`"/>
 		</property>
 		<many-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" unique="true"/>
@@ -48,6 +48,6 @@
 		<many-to-one name="address" entity-name="Address" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_address_id`"/>
 		</many-to-one>
-		<one-to-one name="head" entity-name="Head" property-ref="person" cascade="all" lazy="false"/>
+		<one-to-one name="head" entity-name="Head" cascade="all" property-ref="person" lazy="false"/>
 	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/hibernate.hbm.xml
index 559be5599..82453e737 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:11 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:24 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="false" lazy="false" table="`address`">
 		<meta attribute="eclassName">Address</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="city" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`city`"/>
 		</property>
 	</class>
@@ -27,7 +27,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="hairColor" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`haircolor`"/>
 		</property>
 		<many-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" unique="true"/>
@@ -45,6 +45,6 @@
 		<many-to-one name="address" entity-name="Address" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_address_id`"/>
 		</many-to-one>
-		<one-to-one name="head" entity-name="Head" property-ref="person" cascade="all" lazy="false"/>
+		<one-to-one name="head" entity-name="Head" cascade="all" property-ref="person" lazy="false"/>
 	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml
index d913a3328..06960ec26 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:37 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:52 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`">
 		<meta attribute="eclassName">Body</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml
index 338f0af79..b2dcb3884 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:22 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:38 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Body" abstract="false" lazy="false" table="`body`">
 		<meta attribute="eclassName">Body</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/hibernate.hbm.xml
index 94a2f81f5..c71346be4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:30 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:46 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`myitemtable`">
 		<meta attribute="eclassName">Item</meta>
@@ -14,10 +14,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`mystr`" unique-key="c0"/>
 		</property>
-		<property name="age" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`myint`" unique-key="c0"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/hibernate.hbm.xml
index fd4ad39d3..c14a5f7ed 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:14 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:27 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" table="`myitemtable`">
 		<meta attribute="eclassName">Item</meta>
@@ -13,10 +13,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`mystr`" unique-key="c0"/>
 		</property>
-		<property name="age" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`myint`" unique-key="c0"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/hibernate.hbm.xml
index 7ff93d414..c0e1fca64 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:43 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:59 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Contacts" abstract="false" lazy="false" discriminator-value="Contacts" table="`contacts`">
 		<meta attribute="eclassName">Contacts</meta>
@@ -40,7 +40,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="children" lazy="true" cascade="all,delete-orphan">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/hibernate.hbm.xml
index 673c8161b..d557dc7a9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:41 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:12:57 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Contacts" abstract="false" lazy="false" table="`contacts`">
 		<meta attribute="eclassName">Contacts</meta>
@@ -38,7 +38,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="children" lazy="true" cascade="all,delete-orphan">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml
index 485738a4d..4fe8bb720 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:46 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:02 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="featuremap.ProductClassificationObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="price" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`price`"/>
 		</property>
-		<property name="quantity" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`quantity`"/>
 		</property>
 	</class>
@@ -63,7 +63,7 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`description`"/>
 		</property>
 		<many-to-one name="translatedDescription" entity-name="TranslatedDescriptionType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
@@ -83,7 +83,7 @@
 		<many-to-one name="priceFromSupplier" entity-name="SupplierPriceType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`supplierpricetype_pricefromsupplier_id`"/>
 		</many-to-one>
-		<property name="simplePrice" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="simplePrice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`simpleprice`"/>
 		</property>
 	</class>
@@ -98,10 +98,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="price" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`price`"/>
 		</property>
 	</class>
@@ -116,10 +116,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`description`"/>
 		</property>
-		<property name="language" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="language" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`language`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml
index fcc79bbf1..6ef257cd3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:45 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:01 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="featuremap.ProductClassificationObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
@@ -17,10 +17,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="price" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`price`"/>
 		</property>
-		<property name="quantity" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`quantity`"/>
 		</property>
 	</class>
@@ -61,7 +61,7 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`description`"/>
 		</property>
 		<many-to-one name="translatedDescription" entity-name="TranslatedDescriptionType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
@@ -81,7 +81,7 @@
 		<many-to-one name="priceFromSupplier" entity-name="SupplierPriceType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`supplierpricetype_pricefromsupplier_id`"/>
 		</many-to-one>
-		<property name="simplePrice" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="simplePrice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`simpleprice`"/>
 		</property>
 	</class>
@@ -95,10 +95,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="price" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`price`"/>
 		</property>
 	</class>
@@ -112,10 +112,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`description`"/>
 		</property>
-		<property name="language" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="language" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`language`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/hibernate.hbm.xml
index 6da04519e..e10a2754e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:52 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:07 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ContainedChildNR" abstract="false" lazy="false" discriminator-value="ContainedChildNR" table="`containedchildnr`">
 		<meta attribute="eclassName">ContainedChildNR</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -29,7 +29,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -44,7 +44,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="containedonewayrequired" entity-name="ContainedChildR" cascade="all" lazy="false" insert="true" update="true" not-null="true">
@@ -74,7 +74,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -89,10 +89,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<one-to-one name="main" entity-name="Main" property-ref="notcontainedtwowaynotrequired" cascade="merge,persist,save-update,lock,refresh" lazy="false"/>
+		<one-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" property-ref="notcontainedtwowaynotrequired" lazy="false"/>
 	</class>
 	<class entity-name="NotContainedChildNRTNR" abstract="false" lazy="false" discriminator-value="NotContainedChildNRTNR" table="`notcontainedchildnrtnr`">
 		<meta attribute="eclassName">NotContainedChildNRTNR</meta>
@@ -105,10 +105,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<one-to-one name="main" entity-name="Main" property-ref="notcontainedtwowaynotrequirednr" cascade="merge,persist,save-update,lock,refresh" lazy="false"/>
+		<one-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" property-ref="notcontainedtwowaynotrequirednr" lazy="false"/>
 	</class>
 	<class entity-name="NotContainedChildR" abstract="false" lazy="false" discriminator-value="NotContainedChildR" table="`notcontainedchildr`">
 		<meta attribute="eclassName">NotContainedChildR</meta>
@@ -121,7 +121,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -136,9 +136,9 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<one-to-one name="main" entity-name="Main" property-ref="notcontainedtwowayrequirednr" cascade="merge,persist,save-update,lock,refresh" lazy="false"/>
+		<one-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" property-ref="notcontainedtwowayrequirednr" lazy="false"/>
 	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/hibernate.hbm.xml
index 61fa0e8ba..41f7969cf 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:47 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:03 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ContainedChildNR" abstract="false" lazy="false" table="`containedchildnr`">
 		<meta attribute="eclassName">ContainedChildNR</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -27,7 +27,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -41,7 +41,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="containedonewayrequired" entity-name="ContainedChildR" cascade="all" lazy="false" insert="true" update="true" not-null="true">
@@ -70,7 +70,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -84,10 +84,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<one-to-one name="main" entity-name="Main" property-ref="notcontainedtwowaynotrequired" cascade="merge,persist,save-update,lock,refresh" lazy="false"/>
+		<one-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" property-ref="notcontainedtwowaynotrequired" lazy="false"/>
 	</class>
 	<class entity-name="NotContainedChildNRTNR" abstract="false" lazy="false" table="`notcontainedchildnrtnr`">
 		<meta attribute="eclassName">NotContainedChildNRTNR</meta>
@@ -99,10 +99,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<one-to-one name="main" entity-name="Main" property-ref="notcontainedtwowaynotrequirednr" cascade="merge,persist,save-update,lock,refresh" lazy="false"/>
+		<one-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" property-ref="notcontainedtwowaynotrequirednr" lazy="false"/>
 	</class>
 	<class entity-name="NotContainedChildR" abstract="false" lazy="false" table="`notcontainedchildr`">
 		<meta attribute="eclassName">NotContainedChildR</meta>
@@ -114,7 +114,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -128,9 +128,9 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<one-to-one name="main" entity-name="Main" property-ref="notcontainedtwowayrequirednr" cascade="merge,persist,save-update,lock,refresh" lazy="false"/>
+		<one-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" property-ref="notcontainedtwowayrequirednr" lazy="false"/>
 	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/hibernate.hbm.xml
index 41d619039..a521f81d2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:55 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:09 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Main" abstract="false" lazy="false" discriminator-value="Main" table="`main`">
 		<meta attribute="eclassName">Main</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<list name="onecr" lazy="true" cascade="all,delete-orphan">
@@ -85,7 +85,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -100,7 +100,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -115,7 +115,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -130,7 +130,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -145,7 +145,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
@@ -163,7 +163,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
@@ -181,7 +181,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
@@ -199,7 +199,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/hibernate.hbm.xml
index 2d1a7f457..72aa3409e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:50 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:05 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Main" abstract="false" lazy="false" table="`main`">
 		<meta attribute="eclassName">Main</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<list name="onecr" lazy="true" cascade="all,delete-orphan">
@@ -83,7 +83,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -97,7 +97,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -111,7 +111,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -125,7 +125,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -139,7 +139,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
@@ -156,7 +156,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
@@ -173,7 +173,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
@@ -190,7 +190,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/hibernate.hbm.xml
index 67ae1d00a..a86f8619a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:56 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:11 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Main" abstract="false" lazy="false" discriminator-value="Main" table="`main`">
 		<meta attribute="eclassName">Main</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<list name="multinr" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="main_multinr">
@@ -56,7 +56,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="multinn_main">
@@ -80,7 +80,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="multinr_main">
@@ -104,7 +104,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="multirn_main">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/hibernate.hbm.xml
index 4fabc6de2..b10cfc6ee 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:51 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:06 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Main" abstract="false" lazy="false" table="`main`">
 		<meta attribute="eclassName">Main</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<list name="multinr" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="main_multinr">
@@ -54,7 +54,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="multinn_main">
@@ -77,7 +77,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="multinr_main">
@@ -100,7 +100,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="multirn_main">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml
index 6a99eea1f..cd4d4f49b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:42 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:09 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="CatalogType" abstract="false" lazy="false" discriminator-value="CatalogType" table="`catalogtype`">
 		<meta attribute="eclassName">CatalogType</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`description`"/>
 		</property>
 		<list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh">
@@ -42,10 +42,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="price" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`price`"/>
 		</property>
-		<property name="quantityTo" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="quantityTo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`quantityto`"/>
 		</property>
 		<many-to-one name="supplier" entity-name="SupplierType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true">
@@ -62,7 +62,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`description`"/>
 		</property>
 		<list name="remark" lazy="true" cascade="all,delete-orphan">
@@ -87,7 +87,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="value" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`value`"/>
 		</property>
 	</class>
@@ -102,10 +102,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="noOfEmployees" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="noOfEmployees" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`noofemployees`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml
index 23a800ba1..afccb8273 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:17 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:37 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="CatalogType" abstract="false" lazy="false" table="`catalogtype`">
 		<meta attribute="eclassName">CatalogType</meta>
@@ -12,7 +12,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`description`"/>
 		</property>
 		<list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh">
@@ -40,10 +40,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="price" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`price`"/>
 		</property>
-		<property name="quantityTo" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="quantityTo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`quantityto`"/>
 		</property>
 		<many-to-one name="supplier" entity-name="SupplierType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true">
@@ -59,7 +59,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`description`"/>
 		</property>
 		<list name="remark" lazy="true" cascade="all,delete-orphan">
@@ -83,7 +83,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="value" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`value`"/>
 		</property>
 	</class>
@@ -97,10 +97,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="noOfEmployees" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="noOfEmployees" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`noofemployees`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_a_o/hibernate.hbm.xml
index ce10ad004..18bf2a03a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:31 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:53 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
 		<meta attribute="eclassName">Person</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="group" lazy="true" cascade="all,delete-orphan">
@@ -32,10 +32,10 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="age" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`age`"/>
 		</property>
-		<property name="length" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`length`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_s_o/hibernate.hbm.xml
index 6df353a7b..b86f86c74 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:02 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:23 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" table="`person`">
 		<meta attribute="eclassName">Person</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="group" lazy="true" cascade="all,delete-orphan">
@@ -31,10 +31,10 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="age" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`age`"/>
 		</property>
-		<property name="length" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`length`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/hibernate.hbm.xml
index c766450bc..b627a379e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:49 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:16 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="forum.TopicCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/sample/forum</param>
@@ -18,7 +18,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
 		<list name="members" lazy="true" cascade="all,delete-orphan">
@@ -47,7 +47,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="nickname" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="nickname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`nickname`"/>
 		</property>
 		<list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh">
@@ -76,7 +76,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="comment" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="comment" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`comment`"/>
 		</property>
 		<many-to-one name="author" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
@@ -97,7 +97,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml
index a6c30bacc..7d9832afa 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:24 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:43 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="forum.TopicCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/sample/forum</param>
@@ -17,7 +17,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
 		<list name="members" lazy="true" cascade="all,delete-orphan">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="nickname" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="nickname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`nickname`"/>
 		</property>
 		<list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh">
@@ -73,7 +73,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="comment" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="comment" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`comment`"/>
 		</property>
 		<many-to-one name="author" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
@@ -93,7 +93,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml
index 873951c82..67afc5870 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:40 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:02 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="PType" abstract="false" lazy="false" discriminator-value="PType" table="`ptype`">
 		<meta attribute="eclassName">PType</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="base" entity-name="PType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
@@ -50,7 +50,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml
index 538649fff..a4e1df0b8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:15 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:33 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="PType" abstract="false" lazy="false" table="`ptype`">
 		<meta attribute="eclassName">PType</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="base" entity-name="PType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
@@ -48,7 +48,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml
index 6b2d181d3..2ef88bb46 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:30 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:53 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -19,10 +19,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -47,7 +47,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -79,7 +79,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml
index e1aad4d7e..7411c2085 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:02 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:23 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -76,7 +76,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml
index 34e69db1e..641f171dc 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:41 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:04 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`titl"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`page"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -74,7 +74,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml
index 2e8fc8035..6ecc8bc3d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:15 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:34 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -17,10 +17,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`titl"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`page"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -43,7 +43,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -71,7 +71,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml
index d568bcf5a..348619864 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:43 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:11 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="false" cascade="all,delete-orphan">
@@ -74,7 +74,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml
index 60a5c1ea1..1efdebd27 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:18 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:38 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -17,10 +17,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -43,7 +43,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="false" cascade="all,delete-orphan">
@@ -71,7 +71,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_a_o/hibernate.hbm.xml
index c31bc2417..952e4802c 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:30 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:52 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -19,10 +19,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`TITLE`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`PAGES`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -47,7 +47,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -79,7 +79,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<list name="books" table="WRITER_BOOKS" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_s_o/hibernate.hbm.xml
index 9d18ea219..84cd6f954 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:01 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:22 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`TITLE`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`PAGES`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -76,7 +76,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<list name="books" table="WRITER_BOOKS" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml
index b132e39c0..ae856e396 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:27 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:50 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -74,7 +74,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml
index dafe7153d..9a84868a4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:59 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:19 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -17,10 +17,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -43,7 +43,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -71,7 +71,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml
index f07e8afa1..e5b16fae4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:43 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:11 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -74,7 +74,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml
index 8def77d2e..c4764aadc 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:18 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:38 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -17,10 +17,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -43,7 +43,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -71,7 +71,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml
index fe5bf1a59..988d1cd72 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:25 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:49 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -74,7 +74,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml
index 27331c5ab..924c8756d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:18:58 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:18 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -17,10 +17,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -43,7 +43,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -71,7 +71,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml
index e08992be2..aa4c902c0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:41 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:05 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh">
@@ -74,7 +74,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml
index 08bfd86ff..bbee51090 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:16 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:34 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -17,10 +17,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -43,7 +43,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh">
@@ -71,7 +71,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml
index 327f95e17..7ad88f2b4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:29 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:51 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -18,10 +18,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -74,7 +74,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml
index 39b2e830b..4feef3745 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:01 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:22 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
@@ -17,10 +17,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
-		<property name="pages" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -43,7 +43,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -71,7 +71,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.MindMapAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.MindMapAction/mysql_a_o/hibernate.hbm.xml
new file mode 100644
index 000000000..b8f6338cd
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.MindMapAction/mysql_a_o/hibernate.hbm.xml
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<!--	Generated by Teneo on Wed Nov 15 18:13:45 CET 2006 -->
+<hibernate-mapping>
+	<typedef name="mindmap.PriorityObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</param>
+		<param name="edatatype">PriorityObject</param>
+	</typedef>
+	<typedef name="mindmap.RelationshipTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</param>
+		<param name="edatatype">RelationshipTypeObject</param>
+	</typedef>
+	<class entity-name="Map" abstract="false" lazy="false" discriminator-value="Map" table="`map`">
+		<meta attribute="eclassName">Map</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="rootTopics" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`map_roottopics_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`map_roottopics_idx`"/>
+			<one-to-many entity-name="Topic"/>
+		</list>
+		<list name="relations" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`map_relations_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`map_relations_idx`"/>
+			<one-to-many entity-name="Relationship"/>
+		</list>
+		<list name="resources" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`map_resources_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`map_resources_idx`"/>
+			<one-to-many entity-name="Resource"/>
+		</list>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class entity-name="Relationship" abstract="false" lazy="false" discriminator-value="Relationship" table="`relationship`">
+		<meta attribute="eclassName">Relationship</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="label" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`label`"/>
+		</property>
+		<many-to-one name="source" entity-name="Topic" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`topic_source_id`"/>
+		</many-to-one>
+		<many-to-one name="target" entity-name="Topic" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`topic_target_id`"/>
+		</many-to-one>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType</param>
+			</type>
+		</property>
+	</class>
+	<class entity-name="Resource" abstract="false" lazy="false" discriminator-value="Resource" table="`resource`">
+		<meta attribute="eclassName">Resource</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="comments" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`thread_author_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`resource_comments_idx`"/>
+			<one-to-many entity-name="Thread"/>
+		</list>
+		<property name="email" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`email`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="topics" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="resource_topic">
+			<key update="true">
+				<column name="`resource_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`resource_topics_idx`"/>
+			<many-to-many entity-name="Topic" unique="false">
+				<column name="`topic_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class entity-name="Thread" abstract="false" lazy="false" discriminator-value="Thread" table="`thread`">
+		<meta attribute="eclassName">Thread</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="items" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`thread_items_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`thread_items_idx`"/>
+			<one-to-many entity-name="ThreadItem"/>
+		</list>
+		<many-to-one name="author" entity-name="Resource" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`thread_author_id`"/>
+		</many-to-one>
+		<property name="postDate" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<column not-null="false" unique="false" name="`postdate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
+		</property>
+		<property name="subject" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`subject`"/>
+		</property>
+	</class>
+	<class entity-name="ThreadItem" abstract="false" lazy="false" discriminator-value="ThreadItem" table="`threaditem`">
+		<meta attribute="eclassName">ThreadItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<many-to-one name="author" entity-name="Resource" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`resource_author_id`"/>
+		</many-to-one>
+		<property name="body" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`body`"/>
+		</property>
+		<property name="itemPostDate" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<column not-null="false" unique="false" name="`itempostdate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
+		</property>
+	</class>
+	<class entity-name="Topic" abstract="false" lazy="false" discriminator-value="Topic" table="`topic`">
+		<meta attribute="eclassName">Topic</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="comments" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`topic_comments_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`topic_comments_idx`"/>
+			<one-to-many entity-name="Thread"/>
+		</list>
+		<property name="duration" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`duration`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<column not-null="false" unique="false" name="`enddate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="percentComplete" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`percentcomplete`"/>
+		</property>
+		<property name="priority" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`priority`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority</param>
+			</type>
+		</property>
+		<list name="resources" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="topic_resource">
+			<key update="true">
+				<column name="`topic_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`topic_resources_idx`"/>
+			<many-to-many entity-name="Resource" unique="false">
+				<column name="`resource_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<column not-null="false" unique="false" name="`startdate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
+		</property>
+		<list name="subtopics" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`topic_subtopics_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`topic_subtopics_idx`"/>
+			<one-to-many entity-name="Topic"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.MindMapAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.MindMapAction/mysql_s_o/hibernate.hbm.xml
new file mode 100644
index 000000000..ce8434d24
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.MindMapAction/mysql_s_o/hibernate.hbm.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<!--	Generated by Teneo on Wed Nov 15 18:13:13 CET 2006 -->
+<hibernate-mapping>
+	<typedef name="mindmap.PriorityObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</param>
+		<param name="edatatype">PriorityObject</param>
+	</typedef>
+	<typedef name="mindmap.RelationshipTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</param>
+		<param name="edatatype">RelationshipTypeObject</param>
+	</typedef>
+	<class entity-name="Map" abstract="false" lazy="false" table="`map`">
+		<meta attribute="eclassName">Map</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="rootTopics" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`map_roottopics_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`map_roottopics_idx`"/>
+			<one-to-many entity-name="Topic"/>
+		</list>
+		<list name="relations" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`map_relations_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`map_relations_idx`"/>
+			<one-to-many entity-name="Relationship"/>
+		</list>
+		<list name="resources" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`map_resources_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`map_resources_idx`"/>
+			<one-to-many entity-name="Resource"/>
+		</list>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class entity-name="Relationship" abstract="false" lazy="false" table="`relationship`">
+		<meta attribute="eclassName">Relationship</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="label" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`label`"/>
+		</property>
+		<many-to-one name="source" entity-name="Topic" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`topic_source_id`"/>
+		</many-to-one>
+		<many-to-one name="target" entity-name="Topic" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`topic_target_id`"/>
+		</many-to-one>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.mindmap.RelationshipType</param>
+			</type>
+		</property>
+	</class>
+	<class entity-name="Resource" abstract="false" lazy="false" table="`resource`">
+		<meta attribute="eclassName">Resource</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="comments" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`thread_author_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`resource_comments_idx`"/>
+			<one-to-many entity-name="Thread"/>
+		</list>
+		<property name="email" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`email`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="topics" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="resource_topic">
+			<key update="true">
+				<column name="`resource_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`resource_topics_idx`"/>
+			<many-to-many entity-name="Topic" unique="false">
+				<column name="`topic_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class entity-name="Thread" abstract="false" lazy="false" table="`thread`">
+		<meta attribute="eclassName">Thread</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="items" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`thread_items_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`thread_items_idx`"/>
+			<one-to-many entity-name="ThreadItem"/>
+		</list>
+		<many-to-one name="author" entity-name="Resource" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`thread_author_id`"/>
+		</many-to-one>
+		<property name="postDate" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<column not-null="false" unique="false" name="`postdate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
+		</property>
+		<property name="subject" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`subject`"/>
+		</property>
+	</class>
+	<class entity-name="ThreadItem" abstract="false" lazy="false" table="`threaditem`">
+		<meta attribute="eclassName">ThreadItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<many-to-one name="author" entity-name="Resource" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`resource_author_id`"/>
+		</many-to-one>
+		<property name="body" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`body`"/>
+		</property>
+		<property name="itemPostDate" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<column not-null="false" unique="false" name="`itempostdate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
+		</property>
+	</class>
+	<class entity-name="Topic" abstract="false" lazy="false" table="`topic`">
+		<meta attribute="eclassName">Topic</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/mindmap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="comments" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`topic_comments_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`topic_comments_idx`"/>
+			<one-to-many entity-name="Thread"/>
+		</list>
+		<property name="duration" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`duration`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<column not-null="false" unique="false" name="`enddate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="percentComplete" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`percentcomplete`"/>
+		</property>
+		<property name="priority" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`priority`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.mindmap.Priority</param>
+			</type>
+		</property>
+		<list name="resources" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="topic_resource">
+			<key update="true">
+				<column name="`topic_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`topic_resources_idx`"/>
+			<many-to-many entity-name="Resource" unique="false">
+				<column name="`resource_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<column not-null="false" unique="false" name="`startdate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
+		</property>
+		<list name="subtopics" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`topic_subtopics_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`topic_subtopics_idx`"/>
+			<one-to-many entity-name="Topic"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/hibernate.hbm.xml
index ae4a48bfb..c2d710739 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:44 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:12 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ActType" abstract="false" lazy="false" discriminator-value="ActType" table="`acttype`">
 		<meta attribute="eclassName">ActType</meta>
@@ -21,10 +21,10 @@
 			<list-index column="`acttype_scene_idx`"/>
 			<one-to-many entity-name="SceneType"/>
 		</list>
-		<property name="pindex" type="byte" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pindex" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
 			<column not-null="false" unique="false" name="`pindex`"/>
 		</property>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
 	</class>
@@ -73,10 +73,10 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`title`"/>
 		</property>
-		<property name="persona" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="persona" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`persona`"/>
 		</property>
 		<many-to-one name="personaGroup" entity-name="PersonaGroupType" cascade="all" lazy="false" insert="true" update="true" not-null="false">
@@ -101,7 +101,7 @@
 			<list-index column="`personagrouptype_persona_idx`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<property name="groupDescription" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="groupDescription" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`groupdescription`"/>
 		</property>
 	</class>
@@ -116,7 +116,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
 		<many-to-one name="fm" entity-name="FmType" cascade="all" lazy="false" insert="true" update="true" not-null="true">
@@ -125,10 +125,10 @@
 		<many-to-one name="personae" entity-name="PersonaeType" cascade="all" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`personaetype_personae_id`"/>
 		</many-to-one>
-		<property name="sceneDescription" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="sceneDescription" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`scenedescription`"/>
 		</property>
-		<property name="playSubTitle" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="playSubTitle" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`playsubtitle`"/>
 		</property>
 		<list name="act" lazy="true" cascade="all,delete-orphan">
@@ -157,10 +157,10 @@
 			<list-index column="`scenetype_group_idx`"/>
 			<one-to-many entity-name="SceneType_group"/>
 		</list>
-		<property name="pindex" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="pindex" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`pindex`"/>
 		</property>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
 	</class>
@@ -171,7 +171,7 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="stageDirections" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="stageDirections" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`stagedirections`"/>
 		</property>
 		<many-to-one name="speech" entity-name="SpeechType" cascade="all" lazy="false" insert="true" update="true" not-null="false">
@@ -204,13 +204,13 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="speaker" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="speaker" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`speaker`"/>
 		</property>
-		<property name="line" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="line" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`line`"/>
 		</property>
-		<property name="stageDirections" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="stageDirections" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`stagedirections`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/hibernate.hbm.xml
index 94b20ba4f..d0d9a52a8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:19 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:39 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ActType" abstract="false" lazy="false" table="`acttype`">
 		<meta attribute="eclassName">ActType</meta>
@@ -20,10 +20,10 @@
 			<list-index column="`acttype_scene_idx`"/>
 			<one-to-many entity-name="SceneType"/>
 		</list>
-		<property name="pindex" type="byte" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="pindex" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
 			<column not-null="false" unique="false" name="`pindex`"/>
 		</property>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
 	</class>
@@ -70,10 +70,10 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`title`"/>
 		</property>
-		<property name="persona" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="persona" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`persona`"/>
 		</property>
 		<many-to-one name="personaGroup" entity-name="PersonaGroupType" cascade="all" lazy="false" insert="true" update="true" not-null="false">
@@ -97,7 +97,7 @@
 			<list-index column="`personagrouptype_persona_idx`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<property name="groupDescription" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="groupDescription" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`groupdescription`"/>
 		</property>
 	</class>
@@ -111,7 +111,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
 		<many-to-one name="fm" entity-name="FmType" cascade="all" lazy="false" insert="true" update="true" not-null="true">
@@ -120,10 +120,10 @@
 		<many-to-one name="personae" entity-name="PersonaeType" cascade="all" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`personaetype_personae_id`"/>
 		</many-to-one>
-		<property name="sceneDescription" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="sceneDescription" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`scenedescription`"/>
 		</property>
-		<property name="playSubTitle" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="playSubTitle" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`playsubtitle`"/>
 		</property>
 		<list name="act" lazy="true" cascade="all,delete-orphan">
@@ -151,10 +151,10 @@
 			<list-index column="`scenetype_group_idx`"/>
 			<one-to-many entity-name="SceneType_group"/>
 		</list>
-		<property name="pindex" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="pindex" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`pindex`"/>
 		</property>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
 	</class>
@@ -165,7 +165,7 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="stageDirections" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="stageDirections" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`stagedirections`"/>
 		</property>
 		<many-to-one name="speech" entity-name="SpeechType" cascade="all" lazy="false" insert="true" update="true" not-null="false">
@@ -197,13 +197,13 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="speaker" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="speaker" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`speaker`"/>
 		</property>
-		<property name="line" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="line" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`line`"/>
 		</property>
-		<property name="stageDirections" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="stageDirections" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`stagedirections`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/hibernate.hbm.xml
index c09a47665..7b6795e15 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:46 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:15 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`">
 		<meta attribute="eclassName">Item</meta>
@@ -14,22 +14,26 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="productName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="productName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`productname`"/>
 		</property>
-		<property name="quantity" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
 			<column not-null="true" unique="false" name="`quantity`"/>
 		</property>
-		<property name="uSPrice" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="uSPrice" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
 			<column not-null="true" unique="false" name="`usprice`"/>
 		</property>
-		<property name="comment" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`comment`"/>
 		</property>
-		<property name="shipDate" type="serializable" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false">
 			<column not-null="false" unique="false" name="`shipdate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
-		<property name="partNum" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="partNum" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`partnum`"/>
 		</property>
 	</class>
@@ -50,7 +54,7 @@
 		<many-to-one name="billTo" entity-name="USAddress" cascade="all" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`usaddress_billto_id`"/>
 		</many-to-one>
-		<property name="comment" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`comment`"/>
 		</property>
 		<list name="items" lazy="true" cascade="all,delete-orphan">
@@ -60,8 +64,12 @@
 			<list-index column="`purchaseorder_items_idx`"/>
 			<one-to-many entity-name="Item"/>
 		</list>
-		<property name="orderDate" type="serializable" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="orderDate" lazy="false" insert="true" update="true" not-null="false" unique="false">
 			<column not-null="false" unique="false" name="`orderdate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
 	</class>
 	<class entity-name="USAddress" abstract="false" lazy="false" discriminator-value="USAddress" table="`usaddress`">
@@ -75,22 +83,22 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="street" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`street`"/>
 		</property>
-		<property name="city" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`city`"/>
 		</property>
-		<property name="state" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="state" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`state`"/>
 		</property>
-		<property name="zip" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="zip" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
 			<column not-null="true" unique="false" name="`zip`"/>
 		</property>
-		<property name="country" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`country`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/hibernate.hbm.xml
index 980ff5caf..f250706e3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:21 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:40 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" table="`item`">
 		<meta attribute="eclassName">Item</meta>
@@ -13,22 +13,26 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="productName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="productName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`productname`"/>
 		</property>
-		<property name="quantity" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
 			<column not-null="true" unique="false" name="`quantity`"/>
 		</property>
-		<property name="uSPrice" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="uSPrice" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
 			<column not-null="true" unique="false" name="`usprice`"/>
 		</property>
-		<property name="comment" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`comment`"/>
 		</property>
-		<property name="shipDate" type="serializable" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false">
 			<column not-null="false" unique="false" name="`shipdate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
-		<property name="partNum" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="partNum" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`partnum`"/>
 		</property>
 	</class>
@@ -48,7 +52,7 @@
 		<many-to-one name="billTo" entity-name="USAddress" cascade="all" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`usaddress_billto_id`"/>
 		</many-to-one>
-		<property name="comment" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`comment`"/>
 		</property>
 		<list name="items" lazy="true" cascade="all,delete-orphan">
@@ -58,8 +62,12 @@
 			<list-index column="`purchaseorder_items_idx`"/>
 			<one-to-many entity-name="Item"/>
 		</list>
-		<property name="orderDate" type="serializable" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="orderDate" lazy="false" insert="true" update="true" not-null="false" unique="false">
 			<column not-null="false" unique="false" name="`orderdate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
 	</class>
 	<class entity-name="USAddress" abstract="false" lazy="false" table="`usaddress`">
@@ -72,22 +80,22 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="street" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`street`"/>
 		</property>
-		<property name="city" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`city`"/>
 		</property>
-		<property name="state" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="state" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`state`"/>
 		</property>
-		<property name="zip" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="zip" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
 			<column not-null="true" unique="false" name="`zip`"/>
 		</property>
-		<property name="country" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`country`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/hibernate.hbm.xml
index f319788a8..9ed3d78bd 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:46 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:44 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`">
 		<meta attribute="eclassName">ProductType</meta>
@@ -13,18 +13,34 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="code" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`code`"/>
 		</property>
-		<many-to-one name="supplier" entity-name="SupplierType" cascade="all" lazy="false" insert="true" update="true" not-null="true">
+		<many-to-one name="supplier" entity-name="SupplierType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`suppliertype_supplier_id`"/>
 		</many-to-one>
-		<property name="price" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`price`"/>
 		</property>
-		<property name="createdOn" type="serializable" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="createdOn" lazy="false" insert="true" update="true" not-null="true" unique="false">
 			<column not-null="true" unique="false" name="`createdon`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
+		<any name="AnyOne" id-type="long" cascade="merge,persist,save-update,lock,refresh">
+			<column not-null="false" unique="false" name="`anyone_type`"/>
+			<column not-null="false" unique="false" name="`anyone_id`"/>
+		</any>
+		<list name="AnyList" table="producttype_anylist" lazy="true" cascade="all,delete-orphan">
+			<key/>
+			<list-index column="`producttype_anylist_idx`"/>
+			<many-to-any id-type="long">
+				<column not-null="true" unique="false" name="`anylist_type`"/>
+				<column not-null="true" unique="false" name="`anylist_id`"/>
+			</many-to-any>
+		</list>
 	</class>
 	<class entity-name="SupplierType" abstract="false" lazy="false" discriminator-value="SupplierType" table="`suppliertype`">
 		<meta attribute="eclassName">SupplierType</meta>
@@ -37,11 +53,26 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="noOfEmployees" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="noOfEmployees" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`noofemployees`"/>
 		</property>
 	</class>
+	<class entity-name="ClassificationType" abstract="false" lazy="false" discriminator-value="ClassificationType" table="`classificationtype`">
+		<meta attribute="eclassName">ClassificationType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/product</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/hibernate.hbm.xml
index abd6c907a..12a980cb7 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:21 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:12 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ProductType" abstract="false" lazy="false" table="`producttype`">
 		<meta attribute="eclassName">ProductType</meta>
@@ -12,18 +12,34 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="code" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`code`"/>
 		</property>
-		<many-to-one name="supplier" entity-name="SupplierType" cascade="all" lazy="false" insert="true" update="true" not-null="true">
+		<many-to-one name="supplier" entity-name="SupplierType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`suppliertype_supplier_id`"/>
 		</many-to-one>
-		<property name="price" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`price`"/>
 		</property>
-		<property name="createdOn" type="serializable" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="createdOn" lazy="false" insert="true" update="true" not-null="true" unique="false">
 			<column not-null="true" unique="false" name="`createdon`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
+		<any name="AnyOne" id-type="long" cascade="merge,persist,save-update,lock,refresh">
+			<column not-null="false" unique="false" name="`anyone_type`"/>
+			<column not-null="false" unique="false" name="`anyone_id`"/>
+		</any>
+		<list name="AnyList" table="producttype_anylist" lazy="true" cascade="all,delete-orphan">
+			<key/>
+			<list-index column="`producttype_anylist_idx`"/>
+			<many-to-any id-type="long">
+				<column not-null="true" unique="false" name="`anylist_type`"/>
+				<column not-null="true" unique="false" name="`anylist_id`"/>
+			</many-to-any>
+		</list>
 	</class>
 	<class entity-name="SupplierType" abstract="false" lazy="false" table="`suppliertype`">
 		<meta attribute="eclassName">SupplierType</meta>
@@ -35,11 +51,25 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="noOfEmployees" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="noOfEmployees" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`noofemployees`"/>
 		</property>
 	</class>
+	<class entity-name="ClassificationType" abstract="false" lazy="false" table="`classificationtype`">
+		<meta attribute="eclassName">ClassificationType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/product</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml
index 9f6c62182..eeab6cc72 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:36 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:58 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="sunBooks.BookCategoryTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/sample/sun_books</param>
@@ -60,26 +60,30 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="iSBN" type="long" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="iSBN" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`isbn`"/>
 		</property>
-		<property name="price" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="price" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`price`"/>
 		</property>
 		<many-to-one name="authors" entity-name="AuthorsType" cascade="all" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`authorstype_authors_id`"/>
 		</many-to-one>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`description`"/>
 		</property>
 		<many-to-one name="promotion" entity-name="PromotionType" cascade="all" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`promotiontype_promotion_id`"/>
 		</many-to-one>
-		<property name="publicationDate" type="serializable" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="publicationDate" lazy="false" insert="true" update="true" not-null="true" unique="false">
 			<column not-null="true" unique="false" name="`publicationdate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
 		<property name="bookCategory" lazy="false" not-null="false" insert="true" update="true" unique="false">
 			<column not-null="false" unique="false" name="`bookcategory`"/>
@@ -87,7 +91,7 @@
 				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.sunBooks.BookCategoryType1</param>
 			</type>
 		</property>
-		<property name="itemId" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="itemId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`itemid`"/>
 		</property>
 	</class>
@@ -117,10 +121,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="discount" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="discount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`discount`"/>
 		</property>
-		<property name="none" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="none" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`none`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml
index 23b37d05a..b9e12eed6 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:08 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:29 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="sunBooks.BookCategoryTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/sample/sun_books</param>
@@ -57,26 +57,30 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="iSBN" type="long" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="iSBN" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`isbn`"/>
 		</property>
-		<property name="price" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="price" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`price`"/>
 		</property>
 		<many-to-one name="authors" entity-name="AuthorsType" cascade="all" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`authorstype_authors_id`"/>
 		</many-to-one>
-		<property name="description" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`description`"/>
 		</property>
 		<many-to-one name="promotion" entity-name="PromotionType" cascade="all" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`promotiontype_promotion_id`"/>
 		</many-to-one>
-		<property name="publicationDate" type="serializable" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="publicationDate" lazy="false" insert="true" update="true" not-null="true" unique="false">
 			<column not-null="true" unique="false" name="`publicationdate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
 		<property name="bookCategory" lazy="false" not-null="false" insert="true" update="true" unique="false">
 			<column not-null="false" unique="false" name="`bookcategory`"/>
@@ -84,7 +88,7 @@
 				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.sunBooks.BookCategoryType1</param>
 			</type>
 		</property>
-		<property name="itemId" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="itemId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`itemid`"/>
 		</property>
 	</class>
@@ -112,10 +116,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="discount" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="discount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`discount`"/>
 		</property>
-		<property name="none" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="none" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`none`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/hibernate.hbm.xml
index 934f9af29..75ed915e4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:46 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:15 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="WorkflowElement" abstract="true" lazy="false" discriminator-value="WorkflowElement" table="`workflowelement`">
 		<meta attribute="eclassName">WorkflowElement</meta>
@@ -14,22 +14,22 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
-		<property name="comment" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`comment`"/>
 		</property>
-		<property name="x" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="x" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`x`"/>
 		</property>
-		<property name="y" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="y" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`y`"/>
 		</property>
-		<property name="width" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="width" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`width`"/>
 		</property>
-		<property name="height" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="height" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`height`"/>
 		</property>
 	</class>
@@ -78,10 +78,10 @@
 			<list-index column="`workflownode_inputs_idx`"/>
 			<one-to-many entity-name="InputPort"/>
 		</list>
-		<property name="isStart" type="boolean" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="isStart" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
 			<column not-null="false" unique="false" name="`isstart`"/>
 		</property>
-		<property name="isFinish" type="boolean" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="isFinish" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
 			<column not-null="false" unique="false" name="`isfinish`"/>
 		</property>
 	</subclass>
@@ -144,7 +144,7 @@
 	<subclass entity-name="TransformationTask" abstract="false" lazy="false" extends="WorkflowNode" discriminator-value="TransformationTask">
 		<meta attribute="eclassName">TransformationTask</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
-		<property name="transformExpression" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="transformExpression" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`transformexpression`"/>
 		</property>
 	</subclass>
@@ -155,14 +155,14 @@
 	<subclass entity-name="LoopTask" abstract="false" lazy="false" extends="CompoundTask" discriminator-value="LoopTask">
 		<meta attribute="eclassName">LoopTask</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
-		<property name="whileCondition" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="whileCondition" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`whilecondition`"/>
 		</property>
 	</subclass>
 	<subclass entity-name="ConditionalOutputPort" abstract="false" lazy="false" extends="OutputPort" discriminator-value="ConditionalOutputPort">
 		<meta attribute="eclassName">ConditionalOutputPort</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
-		<property name="condition" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="condition" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`condition`"/>
 		</property>
 	</subclass>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/hibernate.hbm.xml
index a944dab57..f6b6b7f11 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:21 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:13:41 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="WorkflowElement" abstract="true" lazy="false" table="`workflowelement`">
 		<meta attribute="eclassName">WorkflowElement</meta>
@@ -13,22 +13,22 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
-		<property name="comment" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`comment`"/>
 		</property>
-		<property name="x" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="x" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`x`"/>
 		</property>
-		<property name="y" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="y" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`y`"/>
 		</property>
-		<property name="width" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="width" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`width`"/>
 		</property>
-		<property name="height" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="height" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`height`"/>
 		</property>
 	</class>
@@ -83,10 +83,10 @@
 			<list-index column="`workflownode_inputs_idx`"/>
 			<one-to-many entity-name="InputPort"/>
 		</list>
-		<property name="isStart" type="boolean" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="isStart" lazy="false" insert="true" update="true" not-null="true" unique="false" type="boolean">
 			<column not-null="true" unique="false" name="`isstart`"/>
 		</property>
-		<property name="isFinish" type="boolean" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="isFinish" lazy="false" insert="true" update="true" not-null="true" unique="false" type="boolean">
 			<column not-null="true" unique="false" name="`isfinish`"/>
 		</property>
 	</joined-subclass>
@@ -170,7 +170,7 @@
 		<key>
 			<column name="`workflownode_id`"/>
 		</key>
-		<property name="transformExpression" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="transformExpression" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`transformexpression`"/>
 		</property>
 	</joined-subclass>
@@ -187,7 +187,7 @@
 		<key>
 			<column name="`compoundtask_id`"/>
 		</key>
-		<property name="whileCondition" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="whileCondition" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`whilecondition`"/>
 		</property>
 	</joined-subclass>
@@ -197,7 +197,7 @@
 		<key>
 			<column name="`outputport_id`"/>
 		</key>
-		<property name="condition" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="condition" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`condition`"/>
 		</property>
 	</joined-subclass>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_a_o/hibernate.hbm.xml
index 371c5076b..eb8f3d7a5 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:01 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:26 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<meta attribute="eclassName">Book</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -50,10 +50,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="key" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`key`"/>
 		</property>
-		<property name="value" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
 	</class>
@@ -68,7 +68,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="key" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`key`"/>
 		</property>
 		<many-to-one name="value" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
@@ -86,7 +86,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -104,7 +104,7 @@
 		<many-to-one name="key" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`writer_key_id`"/>
 		</many-to-one>
-		<property name="value" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_s_o/hibernate.hbm.xml
index c75afaa74..81dee09a2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:50 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:17 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
 		<meta attribute="eclassName">Book</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="title" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`title`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
@@ -48,10 +48,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="key" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`key`"/>
 		</property>
-		<property name="value" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
 	</class>
@@ -65,7 +65,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="key" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`key`"/>
 		</property>
 		<many-to-one name="value" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
@@ -82,7 +82,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -99,7 +99,7 @@
 		<many-to-one name="key" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`writer_key_id`"/>
 		</many-to-one>
-		<property name="value" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/hibernate.hbm.xml
index 4f115ff90..c4e4c44e8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:04 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:29 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Element" abstract="false" lazy="false" discriminator-value="Element" table="`element`">
 		<meta attribute="eclassName">Element</meta>
@@ -59,10 +59,10 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
-		<property name="value" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
 	</class>
@@ -92,10 +92,10 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
-		<property name="value" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
@@ -113,13 +113,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="firstName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="firstName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`firstname`"/>
 		</property>
-		<property name="middleName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="middleName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`middlename`"/>
 		</property>
-		<property name="lastName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`lastname`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/hibernate.hbm.xml
index 93c45a892..b1a52e2d1 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:53 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:19 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Element" abstract="false" lazy="false" table="`element`">
 		<meta attribute="eclassName">Element</meta>
@@ -57,10 +57,10 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
-		<property name="value" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
 	</class>
@@ -89,10 +89,10 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
-		<property name="value" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
@@ -109,13 +109,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="firstName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="firstName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`firstname`"/>
 		</property>
-		<property name="middleName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="middleName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`middlename`"/>
 		</property>
-		<property name="lastName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`lastname`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/hibernate.hbm.xml
index 7c1714e9c..d9066d889 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:06 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:30 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/extension</param>
@@ -18,13 +18,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="street" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`street`"/>
 		</property>
-		<property name="city" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`city`"/>
 		</property>
 	</class>
@@ -39,7 +39,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="firstAddress" entity-name="FirstAddressHolder" cascade="all" lazy="false" insert="true" update="true" not-null="true">
@@ -56,17 +56,17 @@
 	<subclass entity-name="UKAddress" abstract="false" lazy="false" extends="Address" discriminator-value="UKAddress">
 		<meta attribute="eclassName">UKAddress</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/extension</meta>
-		<property name="postcode" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`postcode`"/>
 		</property>
-		<property name="exportCode" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="exportCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`exportcode`"/>
 		</property>
 	</subclass>
 	<subclass entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" discriminator-value="DistrictUKAddress">
 		<meta attribute="eclassName">DistrictUKAddress</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/extension</meta>
-		<property name="district" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`district`"/>
 		</property>
 	</subclass>
@@ -100,10 +100,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="value" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
-		<property name="currency" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`currency`"/>
 		</property>
 	</class>
@@ -116,7 +116,7 @@
 				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.USState</param>
 			</type>
 		</property>
-		<property name="zip" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`zip`"/>
 		</property>
 	</subclass>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/hibernate.hbm.xml
index 57d4be90e..23bde7765 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:56 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:21 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/extension</param>
@@ -17,13 +17,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
-		<property name="street" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`street`"/>
 		</property>
-		<property name="city" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`city`"/>
 		</property>
 	</class>
@@ -37,7 +37,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<many-to-one name="firstAddress" entity-name="FirstAddressHolder" cascade="all" lazy="false" insert="true" update="true" not-null="true">
@@ -57,10 +57,10 @@
 		<key>
 			<column name="`address_id`"/>
 		</key>
-		<property name="postcode" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`postcode`"/>
 		</property>
-		<property name="exportCode" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="exportCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`exportcode`"/>
 		</property>
 	</joined-subclass>
@@ -70,7 +70,7 @@
 		<key>
 			<column name="`ukaddress_id`"/>
 		</key>
-		<property name="district" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`district`"/>
 		</property>
 	</joined-subclass>
@@ -102,10 +102,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="value" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
-		<property name="currency" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`currency`"/>
 		</property>
 	</class>
@@ -121,7 +121,7 @@
 				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.USState</param>
 			</type>
 		</property>
-		<property name="zip" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`zip`"/>
 		</property>
 	</joined-subclass>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml
index ceec5ff0b..21bd3d771 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:06 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:31 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
 		<meta attribute="eclassName">Address</meta>
@@ -29,10 +29,10 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
-		<property name="longName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="longName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`longname`"/>
 		</property>
 	</class>
@@ -47,7 +47,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="groupName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`groupname`"/>
 		</property>
 		<many-to-one name="shipTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
@@ -56,7 +56,7 @@
 		<many-to-one name="billTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_billto_id`"/>
 		</many-to-one>
-		<property name="simpleAddress" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="simpleAddress" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`simpleaddress`"/>
 		</property>
 	</class>
@@ -71,7 +71,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="groupName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`groupname`"/>
 		</property>
 		<list name="addrs" lazy="true" cascade="all,delete-orphan">
@@ -122,13 +122,13 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="aaa" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="aaa" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`aaa`"/>
 		</property>
-		<property name="bbb" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="bbb" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`bbb`"/>
 		</property>
-		<property name="ccc" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="ccc" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`ccc`"/>
 		</property>
 	</class>
@@ -143,13 +143,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="aaa" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="aaa" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`aaa`"/>
 		</property>
-		<property name="bbb" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="bbb" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`bbb`"/>
 		</property>
-		<property name="ccc" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="ccc" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`ccc`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml
index 9b5d007f4..bca57611e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:56 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:22 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="false" lazy="false" table="`address`">
 		<meta attribute="eclassName">Address</meta>
@@ -28,10 +28,10 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
-		<property name="longName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="longName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`longname`"/>
 		</property>
 	</class>
@@ -45,7 +45,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="groupName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`groupname`"/>
 		</property>
 		<many-to-one name="shipTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
@@ -54,7 +54,7 @@
 		<many-to-one name="billTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_billto_id`"/>
 		</many-to-one>
-		<property name="simpleAddress" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="simpleAddress" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`simpleaddress`"/>
 		</property>
 	</class>
@@ -68,7 +68,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="groupName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`groupname`"/>
 		</property>
 		<list name="addrs" lazy="true" cascade="all,delete-orphan">
@@ -118,13 +118,13 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="aaa" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="aaa" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`aaa`"/>
 		</property>
-		<property name="bbb" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="bbb" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`bbb`"/>
 		</property>
-		<property name="ccc" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="ccc" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`ccc`"/>
 		</property>
 	</class>
@@ -138,13 +138,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="aaa" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="aaa" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`aaa`"/>
 		</property>
-		<property name="bbb" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="bbb" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`bbb`"/>
 		</property>
-		<property name="ccc" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="ccc" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`ccc`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml
index 5a8b6ee92..03175c8d3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:03 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:28 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="list.SixStatesList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
@@ -26,16 +26,16 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="country" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="country" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`country`"/>
 		</property>
-		<property name="index" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="index" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`index`"/>
 		</property>
-		<property name="allStates" type="list.StateList" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="allStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.StateList">
 			<column not-null="true" unique="false" name="`allstates`"/>
 		</property>
-		<property name="sixImportantStates" type="list.SixStatesList" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="sixImportantStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.SixStatesList">
 			<column not-null="true" unique="false" name="`siximportantstates`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/hibernate.hbm.xml
index 5646b8aad..06b2180cb 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:53 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:19 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="list.SixStatesList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
@@ -25,16 +25,16 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="country" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="country" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`country`"/>
 		</property>
-		<property name="index" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="index" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`index`"/>
 		</property>
-		<property name="allStates" type="list.StateList" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="allStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.StateList">
 			<column not-null="true" unique="false" name="`allstates`"/>
 		</property>
-		<property name="sixImportantStates" type="list.SixStatesList" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="sixImportantStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.SixStatesList">
 			<column not-null="true" unique="false" name="`siximportantstates`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/hibernate.hbm.xml
index f297dec68..56ceccb5c 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:04 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:29 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="LetterBodyType" abstract="false" lazy="false" discriminator-value="LetterBodyType" table="`letterbodytype`">
 		<meta attribute="eclassName">LetterBodyType</meta>
@@ -32,14 +32,18 @@
 		<many-to-one name="salutation" entity-name="SalutationType" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`salutationtype_salutation_id`"/>
 		</many-to-one>
-		<property name="quantity" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`quantity`"/>
 		</property>
-		<property name="productName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="productName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`productname`"/>
 		</property>
-		<property name="shipDate" type="serializable" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false">
 			<column not-null="false" unique="false" name="`shipdate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
 		<property name="fme_mixed_cdata" type="java.lang.String"/>
@@ -71,7 +75,7 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/hibernate.hbm.xml
index 5202403cd..ddd4fbaad 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:54 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:20 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="LetterBodyType" abstract="false" lazy="false" table="`letterbodytype`">
 		<meta attribute="eclassName">LetterBodyType</meta>
@@ -31,14 +31,18 @@
 		<many-to-one name="salutation" entity-name="SalutationType" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`salutationtype_salutation_id`"/>
 		</many-to-one>
-		<property name="quantity" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`quantity`"/>
 		</property>
-		<property name="productName" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="productName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`productname`"/>
 		</property>
-		<property name="shipDate" type="serializable" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false">
 			<column not-null="false" unique="false" name="`shipdate`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
 		<property name="fme_mixed_cdata" type="java.lang.String"/>
@@ -69,7 +73,7 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/hibernate.hbm.xml
index 97b3cd529..d25f69f8a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:07 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:32 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="A" abstract="false" lazy="false" discriminator-value="A" table="`a`">
 		<meta attribute="eclassName">A</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="group" lazy="true" cascade="all,delete-orphan">
@@ -32,7 +32,7 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="b" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="b" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`b`"/>
 		</property>
 		<many-to-one name="c" entity-name="CType" cascade="all" lazy="false" insert="true" update="true" not-null="false">
@@ -50,10 +50,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="cname" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="cname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`cname`"/>
 		</property>
-		<property name="cvalue" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="cvalue" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`cvalue`"/>
 		</property>
 	</class>
@@ -83,7 +83,7 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<list name="true" lazy="true" cascade="all,delete-orphan">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/hibernate.hbm.xml
index f560a4a6b..71a0d5608 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:57 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:23 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="A" abstract="false" lazy="false" table="`a`">
 		<meta attribute="eclassName">A</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="group" lazy="true" cascade="all,delete-orphan">
@@ -31,7 +31,7 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="b" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="b" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`b`"/>
 		</property>
 		<many-to-one name="c" entity-name="CType" cascade="all" lazy="false" insert="true" update="true" not-null="false">
@@ -48,10 +48,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="cname" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="cname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`cname`"/>
 		</property>
-		<property name="cvalue" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="cvalue" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`cvalue`"/>
 		</property>
 	</class>
@@ -80,7 +80,7 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 		<list name="true" lazy="true" cascade="all,delete-orphan">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/hibernate.hbm.xml
index 5b12eaccf..48a05db43 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:06 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:30 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="XMLDeviant" abstract="false" lazy="false" discriminator-value="XMLDeviant" table="`xmldeviant`">
 		<meta attribute="eclassName">XMLDeviant</meta>
@@ -14,19 +14,23 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="numPosts" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="numPosts" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`numposts`"/>
 		</property>
-		<property name="signature" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="signature" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`signature`"/>
 		</property>
-		<property name="email" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="email" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`email`"/>
 		</property>
-		<property name="firstSubscribed" type="serializable" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="firstSubscribed" lazy="false" insert="true" update="true" not-null="false" unique="false">
 			<column not-null="false" unique="false" name="`firstsubscribed`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
-		<property name="mailReader" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="mailReader" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`mailreader`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/hibernate.hbm.xml
index 2b5b06b92..c443858b0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:55 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:21 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="XMLDeviant" abstract="false" lazy="false" table="`xmldeviant`">
 		<meta attribute="eclassName">XMLDeviant</meta>
@@ -13,19 +13,23 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="numPosts" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="numPosts" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`numposts`"/>
 		</property>
-		<property name="signature" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="signature" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`signature`"/>
 		</property>
-		<property name="email" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="email" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`email`"/>
 		</property>
-		<property name="firstSubscribed" type="serializable" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="firstSubscribed" lazy="false" insert="true" update="true" not-null="false" unique="false">
 			<column not-null="false" unique="false" name="`firstsubscribed`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">Date</param>
+				<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+			</type>
 		</property>
-		<property name="mailReader" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="mailReader" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`mailreader`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml
index a95273893..800a4b5a0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:02 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:27 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
@@ -18,7 +18,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="code" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`code`"/>
 		</property>
 		<list name="boo" lazy="true" cascade="all,delete-orphan">
@@ -122,28 +122,28 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="code" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`code`"/>
 		</property>
-		<property name="boo" type="boolean" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
 			<column not-null="false" unique="false" name="`boo`"/>
 		</property>
-		<property name="byt" type="byte" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
 			<column not-null="false" unique="false" name="`byt`"/>
 		</property>
-		<property name="doubl" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`doubl`"/>
 		</property>
-		<property name="float" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`float`"/>
 		</property>
-		<property name="inte" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`inte`"/>
 		</property>
-		<property name="lon" type="long" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`lon`"/>
 		</property>
-		<property name="shor" type="short" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="short">
 			<column not-null="false" unique="false" name="`shor`"/>
 		</property>
 		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -152,10 +152,10 @@
 				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
 			</type>
 		</property>
-		<property name="dat" type="timestamp" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="dat" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
 			<column not-null="true" unique="false" name="`dat`"/>
 		</property>
-		<property name="limitedstring" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="limitedstring" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`limitedstring`"/>
 		</property>
 	</class>
@@ -170,34 +170,34 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="code" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`code`"/>
 		</property>
-		<property name="boo" type="java.lang.Boolean" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
 			<column not-null="false" unique="false" name="`boo`"/>
 		</property>
-		<property name="byt" type="java.lang.Byte" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Byte">
 			<column not-null="false" unique="false" name="`byt`"/>
 		</property>
-		<property name="doubl" type="java.lang.Double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Double">
 			<column not-null="false" unique="false" name="`doubl`"/>
 		</property>
-		<property name="float" type="java.lang.Float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Float">
 			<column not-null="false" unique="false" name="`float`"/>
 		</property>
-		<property name="inte" type="java.lang.Integer" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Integer">
 			<column not-null="false" unique="false" name="`inte`"/>
 		</property>
-		<property name="lon" type="java.lang.Long" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Long">
 			<column not-null="false" unique="false" name="`lon`"/>
 		</property>
-		<property name="shor" type="java.lang.Short" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Short">
 			<column not-null="false" unique="false" name="`shor`"/>
 		</property>
 		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false" type="simpletypes.SimpleEnumObject">
 			<column not-null="false" unique="false" name="`enu`"/>
 		</property>
-		<property name="dat" type="timestamp" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="dat" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
 			<column not-null="false" unique="false" name="`dat`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml
index 39b58e96e..e727c60b6 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:51 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:17 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
@@ -17,7 +17,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="code" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`code`"/>
 		</property>
 		<list name="boo" lazy="true" cascade="all,delete-orphan">
@@ -120,28 +120,28 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="code" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`code`"/>
 		</property>
-		<property name="boo" type="boolean" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
 			<column not-null="false" unique="false" name="`boo`"/>
 		</property>
-		<property name="byt" type="byte" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
 			<column not-null="false" unique="false" name="`byt`"/>
 		</property>
-		<property name="doubl" type="double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
 			<column not-null="false" unique="false" name="`doubl`"/>
 		</property>
-		<property name="float" type="float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`float`"/>
 		</property>
-		<property name="inte" type="int" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`inte`"/>
 		</property>
-		<property name="lon" type="long" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`lon`"/>
 		</property>
-		<property name="shor" type="short" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="short">
 			<column not-null="false" unique="false" name="`shor`"/>
 		</property>
 		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false">
@@ -150,10 +150,10 @@
 				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
 			</type>
 		</property>
-		<property name="dat" type="timestamp" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="dat" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
 			<column not-null="true" unique="false" name="`dat`"/>
 		</property>
-		<property name="limitedstring" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="limitedstring" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`limitedstring`"/>
 		</property>
 	</class>
@@ -167,34 +167,34 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="code" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`code`"/>
 		</property>
-		<property name="boo" type="java.lang.Boolean" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
 			<column not-null="false" unique="false" name="`boo`"/>
 		</property>
-		<property name="byt" type="java.lang.Byte" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Byte">
 			<column not-null="false" unique="false" name="`byt`"/>
 		</property>
-		<property name="doubl" type="java.lang.Double" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Double">
 			<column not-null="false" unique="false" name="`doubl`"/>
 		</property>
-		<property name="float" type="java.lang.Float" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Float">
 			<column not-null="false" unique="false" name="`float`"/>
 		</property>
-		<property name="inte" type="java.lang.Integer" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Integer">
 			<column not-null="false" unique="false" name="`inte`"/>
 		</property>
-		<property name="lon" type="java.lang.Long" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Long">
 			<column not-null="false" unique="false" name="`lon`"/>
 		</property>
-		<property name="shor" type="java.lang.Short" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Short">
 			<column not-null="false" unique="false" name="`shor`"/>
 		</property>
 		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false" type="simpletypes.SimpleEnumObject">
 			<column not-null="false" unique="false" name="`enu`"/>
 		</property>
-		<property name="dat" type="timestamp" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="dat" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
 			<column not-null="false" unique="false" name="`dat`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/hibernate.hbm.xml
index c7d8757a5..ddb4c98e9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:05 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:30 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="PurchaseOrder" abstract="false" lazy="false" discriminator-value="PurchaseOrder" table="`purchaseorder`">
 		<meta attribute="eclassName">PurchaseOrder</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -29,7 +29,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="orders" lazy="true" cascade="all,delete-orphan">
@@ -53,10 +53,10 @@
 		<many-to-one name="standardOrders" entity-name="PurchaseOrder" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`purchaseorder_standardorders_id`"/>
 		</many-to-one>
-		<property name="hardCopyOrderReference" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="hardCopyOrderReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`hardcopyorderreference`"/>
 		</property>
-		<property name="hardCopyOrderNumber" type="long" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="hardCopyOrderNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`hardcopyordernumber`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/hibernate.hbm.xml
index 687f4008c..b23d35a60 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:55 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:21 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`">
 		<meta attribute="eclassName">PurchaseOrder</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -27,7 +27,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="orders" lazy="true" cascade="all,delete-orphan">
@@ -51,10 +51,10 @@
 		<many-to-one name="standardOrders" entity-name="PurchaseOrder" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`purchaseorder_standardorders_id`"/>
 		</many-to-one>
-		<property name="hardCopyOrderReference" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="hardCopyOrderReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`hardcopyorderreference`"/>
 		</property>
-		<property name="hardCopyOrderNumber" type="long" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="hardCopyOrderNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`hardcopyordernumber`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/hibernate.hbm.xml
index 092745f0f..12f1a959f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:09 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:33 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ComplexNumber" abstract="false" lazy="false" discriminator-value="ComplexNumber" table="`complexnumber`">
 		<meta attribute="eclassName">ComplexNumber</meta>
@@ -14,10 +14,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="value" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
 			<column not-null="true" unique="false" name="`value`"/>
 		</property>
-		<property name="unit" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="unit" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`unit`"/>
 		</property>
 	</class>
@@ -36,7 +36,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan">
@@ -69,7 +69,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="mySimpleAbstractGroup" lazy="true" cascade="all,delete-orphan">
@@ -94,7 +94,7 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="mySimpleAbstract" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="mySimpleAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`mysimpleabstract`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/hibernate.hbm.xml
index 7ed3aa7f7..076789f1f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:59 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:25 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ComplexNumber" abstract="false" lazy="false" table="`complexnumber`">
 		<meta attribute="eclassName">ComplexNumber</meta>
@@ -13,10 +13,10 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="value" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
 			<column not-null="true" unique="false" name="`value`"/>
 		</property>
-		<property name="unit" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="unit" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`unit`"/>
 		</property>
 	</class>
@@ -37,7 +37,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan">
@@ -69,7 +69,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="mySimpleAbstractGroup" lazy="true" cascade="all,delete-orphan">
@@ -94,7 +94,7 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="mySimpleAbstract" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="mySimpleAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`mysimpleabstract`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/hibernate.hbm.xml
index 5e4532ca7..86109fe7b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:08 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:33 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ComplexAAA" abstract="false" lazy="false" discriminator-value="ComplexAAA" table="`complexaaa`">
 		<meta attribute="eclassName">ComplexAAA</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="value" type="long" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
 	</class>
@@ -59,7 +59,7 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="myAbstract" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="myAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`myabstract`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/hibernate.hbm.xml
index 576daf488..d653d16d7 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:19:58 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:24 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="ComplexAAA" abstract="false" lazy="false" table="`complexaaa`">
 		<meta attribute="eclassName">ComplexAAA</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="value" type="long" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`value`"/>
 		</property>
 	</class>
@@ -63,7 +63,7 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="myAbstract" type="java.math.BigInteger" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="myAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`myabstract`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/hibernate.hbm.xml
index 4c62db7be..4e2269d8f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:17 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:41 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`">
 		<meta attribute="eclassName">Address</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="country" lazy="true" cascade="merge,persist,save-update,lock,refresh">
@@ -36,7 +36,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
@@ -58,7 +58,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="address" lazy="true" cascade="all,delete-orphan">
@@ -72,21 +72,21 @@
 	<subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress">
 		<meta attribute="eclassName">USAddress</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
-		<property name="state" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`state`"/>
 		</property>
 	</subclass>
 	<subclass entity-name="USCity" abstract="false" lazy="false" extends="City" discriminator-value="USCity">
 		<meta attribute="eclassName">USCity</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
-		<property name="state" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`state`"/>
 		</property>
 	</subclass>
 	<subclass entity-name="USOfficeAddress" abstract="false" lazy="false" extends="USAddress" discriminator-value="USOfficeAddress">
 		<meta attribute="eclassName">USOfficeAddress</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
-		<property name="location" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="location" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`location`"/>
 		</property>
 	</subclass>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/hibernate.hbm.xml
index af3774389..21517614f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:12 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:36 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="true" lazy="false" table="`address`">
 		<meta attribute="eclassName">Address</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="country" lazy="true" cascade="merge,persist,save-update,lock,refresh">
@@ -34,7 +34,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
@@ -55,7 +55,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="address" lazy="true" cascade="all,delete-orphan">
@@ -72,7 +72,7 @@
 		<key>
 			<column name="`address_id`"/>
 		</key>
-		<property name="state" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="state" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`state`"/>
 		</property>
 	</joined-subclass>
@@ -82,7 +82,7 @@
 		<key>
 			<column name="`city_id`"/>
 		</key>
-		<property name="state" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="state" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`state`"/>
 		</property>
 	</joined-subclass>
@@ -92,7 +92,7 @@
 		<key>
 			<column name="`usaddress_id`"/>
 		</key>
-		<property name="location" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="location" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`location`"/>
 		</property>
 	</joined-subclass>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml
index cc8c8ba8f..26a24539d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:16 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:40 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
 		<meta attribute="eclassName">Person</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml
index bbe8babd3..c3389c3f6 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:11 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:35 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" table="`person`">
 		<meta attribute="eclassName">Person</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml
index fc7db661f..8a82fde79 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:17 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:40 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="enumtest.ItemTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/enumtest</param>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml
index 56ad4617d..7ada566e5 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:12 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:36 CET 2006 -->
 <hibernate-mapping>
 	<typedef name="enumtest.ItemTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/enumtest</param>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml
index 1ad77c206..d9b3e09d4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:16 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:40 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Thing" abstract="false" lazy="false" discriminator-value="Thing" table="`thing`">
 		<meta attribute="eclassName">Thing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml
index cc710a4c5..08dabe380 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:10 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:34 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Thing" abstract="false" lazy="false" table="`thing`">
 		<meta attribute="eclassName">Thing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/hibernate.hbm.xml
index 51dab40a6..6b5b6473a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:18 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:41 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`">
 		<meta attribute="eclassName">Address</meta>
@@ -14,14 +14,14 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
 	<subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress">
 		<meta attribute="eclassName">USAddress</meta>
 		<meta attribute="epackage">http:///org/elver/store/test/issues/interfacetrue.ecore</meta>
-		<property name="state" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`state`"/>
 		</property>
 	</subclass>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/hibernate.hbm.xml
index a8fc45bf8..4f842a10a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:13 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:37 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="true" lazy="false" table="`address`">
 		<meta attribute="eclassName">Address</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 	</class>
@@ -23,7 +23,7 @@
 		<key>
 			<column name="`address_id`"/>
 		</key>
-		<property name="state" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="state" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`state`"/>
 		</property>
 	</joined-subclass>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/mysql_a_o/hibernate.hbm.xml
index 09b9480f2..8edcc8f1c 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:16 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:39 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`">
 		<meta attribute="eclassName">Item</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<bag name="mySide" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="item_item">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/mysql_s_o/hibernate.hbm.xml
index 245a15e5b..89ad3e36e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:10 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:34 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" table="`item`">
 		<meta attribute="eclassName">Item</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<bag name="mySide" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="item_item">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml
index 952079590..e8c3f24ed 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:16 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:40 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Head" abstract="false" lazy="false" discriminator-value="Head" table="`head`">
 		<meta attribute="eclassName">Head</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml
index 53769e1fa..a2d3ce0e2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:11 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:35 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Head" abstract="false" lazy="false" table="`head`">
 		<meta attribute="eclassName">Head</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/hibernate.hbm.xml
index 8fa7adb8a..3257e0adc 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:18 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:41 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Me" abstract="false" lazy="false" discriminator-value="Me" table="`me`">
 		<meta attribute="eclassName">Me</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="you" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="me_you">
@@ -38,7 +38,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="me" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="you_me">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/hibernate.hbm.xml
index 50ddf496f..a8b650dbb 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:13 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:37 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Me" abstract="false" lazy="false" table="`me`">
 		<meta attribute="eclassName">Me</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="you" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="me_you">
@@ -36,7 +36,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`name`"/>
 		</property>
 		<list name="me" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="you_me">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_a_o/hibernate.hbm.xml
index c33ae8e2f..5103472e7 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:18 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:42 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="AbstractSuper" abstract="false" lazy="false" discriminator-value="AbstractSuper" table="`abstractsuper`">
 		<meta attribute="eclassName">AbstractSuper</meta>
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_s_o/hibernate.hbm.xml
index 53b51c451..d5d22da61 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 10:20:14 CET 2006 -->
+<!--	Generated by Teneo on Wed Nov 15 18:14:38 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="AbstractSuper" abstract="false" lazy="false" table="`abstractsuper`">
 		<meta attribute="eclassName">AbstractSuper</meta>
@@ -13,7 +13,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false">
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`name`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java
index 08d038dbc..55304a6bd 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: AllTests.java,v 1.22 2006/11/14 10:58:22 mtaal Exp $
+ * $Id: AllTests.java,v 1.23 2006/11/15 17:17:28 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.test.emf.sample;
@@ -34,6 +34,7 @@ import org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction;
+import org.eclipse.emf.teneo.test.emf.sample.MindMapAction;
 import org.eclipse.emf.teneo.test.emf.sample.PlayAction;
 import org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction;
 import org.eclipse.emf.teneo.test.emf.sample.ProductAction;
@@ -44,15 +45,18 @@ import org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction;
  * All sample tests
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.22 $
+ * @version $Revision: 1.23 $
  */
 public class AllTests {
 
 	public static Test suite() {
 		TestSuite suite = new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.hibernate.test.emf.sample", HibernateTestbed.instance()
 				.getConfigurations());
-	//	suite.addTestSuite(YahooAction.class);
+		suite.addTestSuite(ProductAction.class);
 
+		//	suite.addTestSuite(YahooAction.class);
+		suite.addTestSuite(MindMapAction.class);
+		
 		suite.addTestSuite(LibraryResourceAction.class);
 		suite.addTestSuite(LibrarySessionControllerAction.class);
 		suite.addTestSuite(LibraryNonResolvingAction.class);
@@ -90,9 +94,9 @@ public class AllTests {
 		suite.addTestSuite(LibraryGlobalEagerAction.class);
 		suite.addTestSuite(PlayAction.class);
 		suite.addTestSuite(PrimerPOAction.class);
-		suite.addTestSuite(ProductAction.class);
 		suite.addTestSuite(WorkFlowAction.class);
 		suite.addTestSuite(ForumAction.class);
+
 		return suite;
 	}
 }
diff --git a/tests/org.eclipse.emf.teneo.jpox.libraries/.classpath b/tests/org.eclipse.emf.teneo.jpox.libraries/.classpath
index a3de00294..0caa40b87 100644
--- a/tests/org.eclipse.emf.teneo.jpox.libraries/.classpath
+++ b/tests/org.eclipse.emf.teneo.jpox.libraries/.classpath
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="commons-collections-3.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="commons-dbcp-1.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="commons-pool-1.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="jpox-dbcp-1.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="jpox-1.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="jpox-enhancer-1.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="bcel-5.1.jar"/>
diff --git a/tests/org.eclipse.emf.teneo.jpox.libraries/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.teneo.jpox.libraries/META-INF/MANIFEST.MF
index 937f41713..a05ee934e 100644
--- a/tests/org.eclipse.emf.teneo.jpox.libraries/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.teneo.jpox.libraries/META-INF/MANIFEST.MF
@@ -94,4 +94,8 @@ Bundle-ClassPath: bcel-5.1.jar,
  jpox.jar,
  log4j-1.2.13.jar,
  jpox-1.1.3.jar,
- jpox-enhancer-1.1.3.jar
+ jpox-enhancer-1.1.3.jar,
+ commons-collections-3.1.jar,
+ commons-dbcp-1.2.1.jar,
+ commons-pool-1.2.jar,
+ jpox-dbcp-1.1.3.jar
diff --git a/tests/org.eclipse.emf.teneo.jpox.libraries/build.properties b/tests/org.eclipse.emf.teneo.jpox.libraries/build.properties
index a4c085b1f..dd2d2d7a8 100644
--- a/tests/org.eclipse.emf.teneo.jpox.libraries/build.properties
+++ b/tests/org.eclipse.emf.teneo.jpox.libraries/build.properties
@@ -5,4 +5,8 @@ bin.includes = META-INF/,\
                jdo2-api-2.0.jar,\
                log4j-1.2.13.jar,\
                jpox-1.1.3.jar,\
-               jpox-enhancer-1.1.3.jar
+               jpox-enhancer-1.1.3.jar,\
+               commons-collections-3.1.jar,\
+               commons-dbcp-1.2.1.jar,\
+               commons-pool-1.2.jar,\
+               jpox-dbcp-1.1.3.jar
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_a_o/package.jdo
index 32e5bb030..45a2291d3 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:09 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:21 CET 2006 -->
 <jdo>
 	<package name="extlibrary.impl">
 		<class name="extlibrary.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_s_o/package.jdo
index 81a40ea55..26ab09eea 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/extlibrary.ExtLibraryAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:41 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:38:59 CET 2006 -->
 <jdo>
 	<package name="extlibrary.impl">
 		<class name="extlibrary.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_a_o/package.jdo
index 0d6e6b316..14498c03d 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:15 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:25 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="account" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_s_o/package.jdo
index d6425f1c0..b09cf7b4f 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.AccountingTest$1/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:46 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:04 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="account" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_a_o/package.jdo
index a9173bd09..7bd8499e9 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:23 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:30 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.CatalogTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="catalogtype" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_s_o/package.jdo
index f3644e3bc..97b550ef9 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.CatalogTest$1/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:54 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:10 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.CatalogTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="catalogtype" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/package.jdo
index 49ec33727..cb7119fb2 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:14 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:24 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="item" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/package.jdo
index efedb1baf..1d73e5705 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:45 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:03 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="item" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/mysql_a_o/package.jdo
index b41f292b4..c5989e7be 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:56 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:13 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/mysql_s_o/package.jdo
index 16c3dda07..417fa047c 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryPMControllerAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:31 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:38:49 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_a_o/package.jdo
index c7194f034..4a2bca585 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:57 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:14 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_s_o/package.jdo
index 561700190..417fa047c 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.LibraryTest$1/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:32 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:38:49 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_a_o/package.jdo
index 4c7a509ec..88574fadb 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:16 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:26 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.play.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.ActTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="acttype" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_s_o/package.jdo
index 62ed042b7..bbd9b6c8a 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.PlayImExportTest$1/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:47 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:05 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.play.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.ActTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="acttype" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/package.jdo
index d3cb77263..5d0121d92 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:12 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:23 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/package.jdo
index 3d063afb8..3c91f556f 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.jpox.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:44 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:02 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/package.jdo
index 33079cce4..ecebb7326 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:11 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:22 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.CatalogTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="catalogtype" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/package.jdo
index 3070e747a..afe8086ee 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:43 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:01 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.CatalogTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="catalogtype" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/package.jdo
index 1c784b448..fdb26065a 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:22 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:29 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.ForumImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="forum" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/package.jdo
index 182e32611..1f4e23f35 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:52 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:09 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.ForumImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="forum" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/package.jdo
index 22032c97d..72f8eb269 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:10 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:22 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="ptype" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/package.jdo
index db20d4a51..778851d8e 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:42 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:00 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="ptype" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/package.jdo
index c49c61d27..cf514cacd 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:05 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:18 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/package.jdo
index 1a14ce9e4..8997682b9 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:38 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:38:54 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/package.jdo
index 7f0ef4fcf..89990b0dd 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:59 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:15 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/package.jdo
index 0e7469d09..878ba7461 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:34 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:38:51 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/package.jdo
index a2d92293c..c800ae0ae 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:02 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:17 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/package.jdo
index 63b330927..42cba502c 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:36 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:38:52 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/package.jdo
index a66fd13a8..89990b0dd 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:58 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:15 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/package.jdo
index d6d64ffe1..d1fb044dc 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:33 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:38:50 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/package.jdo
index 65d951473..336ebe4e0 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:01 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:16 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/package.jdo
index 82623137a..42cba502c 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:35 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:38:52 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_a_o/package.jdo
index 92e50b220..cf514cacd 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:03 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:18 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_s_o/package.jdo
index 727135083..a434137e9 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:37 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:38:53 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.MindMapAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.MindMapAction/mysql_a_o/package.jdo
new file mode 100644
index 000000000..9a25899bd
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.MindMapAction/mysql_a_o/package.jdo
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
+
+<!--	Generated by Teneo on Tue Nov 14 15:39:11 CET 2006 -->
+<jdo>
+	<package name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl">
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MapImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="map" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table">
+				<discriminator column="DTYPE" strategy="value-map" value="Map"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="rootTopics" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="MAP_ROOTTOPICS_IDX"/>
+				<column name="map_roottopics_id" allows-null="true"/>
+				<foreign-key delete-action="cascade" update-action="cascade"/>
+			</field>
+			<field name="relations" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.RelationshipImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="MAP_RELATIONS_IDX"/>
+				<column name="map_relations_id" allows-null="true"/>
+				<foreign-key delete-action="cascade" update-action="cascade"/>
+			</field>
+			<field name="resources" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="MAP_RESOURCES_IDX"/>
+				<column name="map_resources_id" allows-null="true"/>
+				<foreign-key delete-action="cascade" update-action="cascade"/>
+			</field>
+			<field name="title" persistence-modifier="persistent" null-value="none"/>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.RelationshipImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="relationship" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table">
+				<discriminator column="DTYPE" strategy="value-map" value="Relationship"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="label" persistence-modifier="persistent" null-value="none"/>
+			<field name="source" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+				<foreign-key>
+					<column name="topic_source_id" allows-null="true"/>
+				</foreign-key>
+				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl"/>
+			</field>
+			<field name="target" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+				<foreign-key>
+					<column name="topic_target_id" allows-null="true"/>
+				</foreign-key>
+				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl"/>
+			</field>
+			<field name="type" persistence-modifier="persistent" null-value="none" embedded="true"/>
+			<field name="typeESet" persistence-modifier="persistent"/>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="resource" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table">
+				<discriminator column="DTYPE" strategy="value-map" value="Resource"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="comments" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl" dependent-element="false">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="RESOURCE_COMMENTS_IDX"/>
+				<column name="thread_author_id" allows-null="true"/>
+				<foreign-key delete-action="restrict" update-action="cascade"/>
+			</field>
+			<field name="email" persistence-modifier="persistent" null-value="none"/>
+			<field name="name" persistence-modifier="persistent" null-value="none"/>
+			<field name="topics" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl" dependent-element="false">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<join/>
+			</field>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="thread" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table">
+				<discriminator column="DTYPE" strategy="value-map" value="Thread"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="items" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadItemImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="THREAD_ITEMS_IDX"/>
+				<column name="thread_items_id" allows-null="true"/>
+				<foreign-key delete-action="cascade" update-action="cascade"/>
+			</field>
+			<field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+				<foreign-key>
+					<column name="thread_author_id" allows-null="true"/>
+				</foreign-key>
+				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl"/>
+			</field>
+			<field name="postDate" persistence-modifier="persistent" null-value="none" serialized="true"/>
+			<field name="subject" persistence-modifier="persistent" null-value="none"/>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="threaditem" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table">
+				<discriminator column="DTYPE" strategy="value-map" value="ThreadItem"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+				<foreign-key>
+					<column name="resource_author_id" allows-null="true"/>
+				</foreign-key>
+				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl"/>
+			</field>
+			<field name="body" persistence-modifier="persistent" null-value="none"/>
+			<field name="itemPostDate" persistence-modifier="persistent" null-value="none" serialized="true"/>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="topic" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table">
+				<discriminator column="DTYPE" strategy="value-map" value="Topic"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="comments" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="TOPIC_COMMENTS_IDX"/>
+				<column name="topic_comments_id" allows-null="true"/>
+				<foreign-key delete-action="cascade" update-action="cascade"/>
+			</field>
+			<field name="duration" persistence-modifier="persistent" null-value="none"/>
+			<field name="durationESet" persistence-modifier="persistent"/>
+			<field name="endDate" persistence-modifier="persistent" null-value="none" serialized="true"/>
+			<field name="name" persistence-modifier="persistent" null-value="none"/>
+			<field name="percentComplete" persistence-modifier="persistent" null-value="none"/>
+			<field name="percentCompleteESet" persistence-modifier="persistent"/>
+			<field name="priority" persistence-modifier="persistent" null-value="none" embedded="true"/>
+			<field name="priorityESet" persistence-modifier="persistent"/>
+			<field name="resources" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl" dependent-element="false">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<join/>
+			</field>
+			<field name="startDate" persistence-modifier="persistent" null-value="none" serialized="true"/>
+			<field name="subtopics" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl" dependent-element="false">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="TOPIC_SUBTOPICS_IDX"/>
+				<column name="topic_subtopics_id" allows-null="true"/>
+				<foreign-key delete-action="restrict" update-action="cascade"/>
+			</field>
+		</class>
+	</package>
+</jdo>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.MindMapAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.MindMapAction/mysql_s_o/package.jdo
new file mode 100644
index 000000000..622836577
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.MindMapAction/mysql_s_o/package.jdo
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
+
+<!--	Generated by Teneo on Tue Nov 14 15:38:46 CET 2006 -->
+<jdo>
+	<package name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl">
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.MapImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="map" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Map"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table"/>
+			<version strategy="version-number" column="e_version"/>
+			<field name="rootTopics" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="MAP_ROOTTOPICS_IDX"/>
+				<column name="map_roottopics_id" allows-null="true"/>
+				<foreign-key delete-action="cascade" update-action="cascade"/>
+			</field>
+			<field name="relations" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.RelationshipImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="MAP_RELATIONS_IDX"/>
+				<column name="map_relations_id" allows-null="true"/>
+				<foreign-key delete-action="cascade" update-action="cascade"/>
+			</field>
+			<field name="resources" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="MAP_RESOURCES_IDX"/>
+				<column name="map_resources_id" allows-null="true"/>
+				<foreign-key delete-action="cascade" update-action="cascade"/>
+			</field>
+			<field name="title" persistence-modifier="persistent" null-value="none"/>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.RelationshipImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="relationship" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Relationship"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table"/>
+			<version strategy="version-number" column="e_version"/>
+			<field name="label" persistence-modifier="persistent" null-value="none"/>
+			<field name="source" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+				<foreign-key>
+					<column name="topic_source_id" allows-null="true"/>
+				</foreign-key>
+				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl"/>
+			</field>
+			<field name="target" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+				<foreign-key>
+					<column name="topic_target_id" allows-null="true"/>
+				</foreign-key>
+				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl"/>
+			</field>
+			<field name="type" persistence-modifier="persistent" null-value="none" embedded="true"/>
+			<field name="typeESet" persistence-modifier="persistent"/>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="resource" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Resource"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table"/>
+			<version strategy="version-number" column="e_version"/>
+			<field name="comments" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl" dependent-element="false">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="RESOURCE_COMMENTS_IDX"/>
+				<column name="thread_author_id" allows-null="true"/>
+				<foreign-key delete-action="restrict" update-action="cascade"/>
+			</field>
+			<field name="email" persistence-modifier="persistent" null-value="none"/>
+			<field name="name" persistence-modifier="persistent" null-value="none"/>
+			<field name="topics" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl" dependent-element="false">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<join/>
+			</field>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="thread" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Thread"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table"/>
+			<version strategy="version-number" column="e_version"/>
+			<field name="items" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadItemImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="THREAD_ITEMS_IDX"/>
+				<column name="thread_items_id" allows-null="true"/>
+				<foreign-key delete-action="cascade" update-action="cascade"/>
+			</field>
+			<field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+				<foreign-key>
+					<column name="thread_author_id" allows-null="true"/>
+				</foreign-key>
+				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl"/>
+			</field>
+			<field name="postDate" persistence-modifier="persistent" null-value="none" serialized="true"/>
+			<field name="subject" persistence-modifier="persistent" null-value="none"/>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="threaditem" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.ThreadItem"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table"/>
+			<version strategy="version-number" column="e_version"/>
+			<field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+				<foreign-key>
+					<column name="resource_author_id" allows-null="true"/>
+				</foreign-key>
+				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl"/>
+			</field>
+			<field name="body" persistence-modifier="persistent" null-value="none"/>
+			<field name="itemPostDate" persistence-modifier="persistent" null-value="none" serialized="true"/>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="topic" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.mindmap.Topic"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table"/>
+			<version strategy="version-number" column="e_version"/>
+			<field name="comments" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ThreadImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="TOPIC_COMMENTS_IDX"/>
+				<column name="topic_comments_id" allows-null="true"/>
+				<foreign-key delete-action="cascade" update-action="cascade"/>
+			</field>
+			<field name="duration" persistence-modifier="persistent" null-value="none"/>
+			<field name="durationESet" persistence-modifier="persistent"/>
+			<field name="endDate" persistence-modifier="persistent" null-value="none" serialized="true"/>
+			<field name="name" persistence-modifier="persistent" null-value="none"/>
+			<field name="percentComplete" persistence-modifier="persistent" null-value="none"/>
+			<field name="percentCompleteESet" persistence-modifier="persistent"/>
+			<field name="priority" persistence-modifier="persistent" null-value="none" embedded="true"/>
+			<field name="priorityESet" persistence-modifier="persistent"/>
+			<field name="resources" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.ResourceImpl" dependent-element="false">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<join/>
+			</field>
+			<field name="startDate" persistence-modifier="persistent" null-value="none" serialized="true"/>
+			<field name="subtopics" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.mindmap.impl.TopicImpl" dependent-element="false">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="TOPIC_SUBTOPICS_IDX"/>
+				<column name="topic_subtopics_id" allows-null="true"/>
+				<foreign-key delete-action="restrict" update-action="cascade"/>
+			</field>
+		</class>
+	</package>
+</jdo>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/package.jdo
index cd5fc9c30..88574fadb 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:17 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:26 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.play.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.ActTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="acttype" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/package.jdo
index 70be694af..fd8b45163 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:48 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:06 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.play.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.ActTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="acttype" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/package.jdo
index f849c9159..2ecea65b6 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:20 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:28 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="item" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/package.jdo
index 135cd1c64..7835c119c 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:51 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:07 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="item" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/package.jdo
index 7d13e024d..12c1d8c9a 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:19 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:27 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.product.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="producttype" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/package.jdo
index 0f0279c7a..6ef43e525 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:50 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:07 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.product.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="producttype" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/package.jdo
index 763695ebd..06fe4e923 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:07 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:20 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.AuthorsTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="authorstype" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/package.jdo
index 37d9baa46..d3ae6496e 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:40 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:38:58 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.AuthorsTypeImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="authorstype" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/package.jdo
index 0cd28c956..cc606ea92 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:36:06 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:39:19 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/package.jdo
index 582a7dcd9..360f7feb5 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Tue Nov 14 11:35:39 CET 2006 -->
+<!--	Generated by Teneo on Tue Nov 14 15:38:56 CET 2006 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="workflow" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllGenerateTests.java b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllGenerateTests.java
index fa5b8e5f5..0af030c51 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllGenerateTests.java
+++ b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllGenerateTests.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: AllGenerateTests.java,v 1.8 2006/10/04 14:08:56 mtaal Exp $
+ * $Id: AllGenerateTests.java,v 1.9 2006/11/15 17:18:03 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.jpox.test.emf.sample;
@@ -30,6 +30,7 @@ import org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction;
+import org.eclipse.emf.teneo.test.emf.sample.MindMapAction;
 import org.eclipse.emf.teneo.test.emf.sample.PlayAction;
 import org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction;
 import org.eclipse.emf.teneo.test.emf.sample.ProductAction;
@@ -42,12 +43,13 @@ import extlibrary.ExtLibraryAction;
  * All tests
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  */
 public class AllGenerateTests {
 	public static Test suite() {
 		MultiCfgTestSuite suite = new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.test.samples", JPOXTestbed
 				.instance().getConfigurations());
+		suite.addTest(new JPOXGenerateTest(MindMapAction.class));
 		suite.addTest(new JPOXGenerateTest(LibraryPMControllerAction.class));
 
 		suite.addTest(new JPOXGenerateTest(LibraryTest.testAction));
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllTests.java b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllTests.java
index 5ff48ba99..b57bf3cc5 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllTests.java
+++ b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllTests.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: AllTests.java,v 1.13 2006/11/14 10:56:33 mtaal Exp $
+ * $Id: AllTests.java,v 1.14 2006/11/15 17:18:03 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.jpox.test.emf.sample;
@@ -30,6 +30,7 @@ import org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryValidateResourceAction;
+import org.eclipse.emf.teneo.test.emf.sample.MindMapAction;
 import org.eclipse.emf.teneo.test.emf.sample.PlayAction;
 import org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction;
 import org.eclipse.emf.teneo.test.emf.sample.ProductAction;
@@ -41,13 +42,15 @@ import extlibrary.ExtLibraryAction;
  * All tests
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
  */
 public class AllTests {
 
 	public static Test suite() {
 		TestSuite suite = new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.test.samples", JPOXTestbed.instance()
 				.getConfigurations());
+		suite.addTestSuite(MindMapAction.class);
+
 		suite.addTestSuite(LibraryPMControllerAction.class);
 		suite.addTestSuite(SchoolLibraryTest.class);