Several changes for EmfLite

3 files changed, 1451 insertions, 307 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.GMFNotationAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.GMFNotationAction/mysql_a_o/hibernate.hbm.xml
index b45d26098..40857f3b7 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.GMFNotationAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.GMFNotationAction/mysql_a_o/hibernate.hbm.xml
@@ -1,16 +1,79 @@
 <?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 Oct 17 15:53:35 CEST 2006 -->
+<!--	Generated by Teneo on Mon Nov 20 15:05:01 CET 2006 -->
 <hibernate-mapping>
-	<class entity-name="EObject" abstract="false" lazy="false" discriminator-value="EObject" table="`eobject`">
-		<id type="long" name="e_id" column="e_id">
+	<typedef name="ecore.EDiagnosticChain" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EDiagnosticChain</param>
+	</typedef>
+	<typedef name="ecore.EEList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EEList</param>
+	</typedef>
+	<typedef name="ecore.EEnumerator" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EEnumerator</param>
+	</typedef>
+	<typedef name="ecore.EFeatureMap" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EFeatureMap</param>
+	</typedef>
+	<typedef name="ecore.EFeatureMapEntry" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EFeatureMapEntry</param>
+	</typedef>
+	<typedef name="ecore.EMap" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EMap</param>
+	</typedef>
+	<typedef name="ecore.EResource" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EResource</param>
+	</typedef>
+	<typedef name="ecore.EResourceSet" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EResourceSet</param>
+	</typedef>
+	<typedef name="ecore.ETreeIterator" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">ETreeIterator</param>
+	</typedef>
+	<typedef name="notation.RelativeBendpointList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</param>
+		<param name="edatatype">RelativeBendpointList</param>
+	</typedef>
+	<typedef name="notation.FilterKeyList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</param>
+		<param name="edatatype">FilterKeyList</param>
+	</typedef>
+	<typedef name="notation.SortKeyMap" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</param>
+		<param name="edatatype">SortKeyMap</param>
+	</typedef>
+	<typedef name="mindmap.PriorityObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.example.org/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.example.org/mindmap</param>
+		<param name="edatatype">RelationshipTypeObject</param>
+	</typedef>
+	<class entity-name="http://www.eclipse.org/emf/2002/Ecore/EObject" abstract="false" lazy="false" discriminator-value="EObject" table="`eobject`">
+		<meta attribute="eclassName">EObject</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</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"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
 	</class>
-	<subclass entity-name="EModelElement" abstract="true" lazy="false" extends="EObject" discriminator-value="EModelElement">
+	<subclass entity-name="EModelElement" abstract="true" lazy="false" extends="http://www.eclipse.org/emf/2002/Ecore/EObject" discriminator-value="EModelElement">
+		<meta attribute="eclassName">EModelElement</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<list name="eAnnotations" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`eannotation_emodelelement_id`" not-null="false" unique="false"/>
@@ -20,33 +83,69 @@
 		</list>
 	</subclass>
 	<subclass entity-name="ENamedElement" abstract="true" lazy="false" extends="EModelElement" discriminator-value="ENamedElement">
-		<property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/>
+		<meta attribute="eclassName">ENamedElement</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<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>
 	</subclass>
 	<subclass entity-name="ETypedElement" abstract="true" lazy="false" extends="ENamedElement" discriminator-value="ETypedElement">
-		<property name="ordered" type="boolean" lazy="false" column="`ordered`" not-null="false"/>
-		<property name="unique" type="boolean" lazy="false" column="`unique`" not-null="false"/>
-		<property name="lowerBound" type="int" lazy="false" column="`lowerbound`" not-null="false"/>
-		<property name="upperBound" type="int" lazy="false" column="`upperbound`" not-null="false"/>
+		<meta attribute="eclassName">ETypedElement</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<property name="ordered" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`ordered`"/>
+		</property>
+		<property name="unique" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`unique`"/>
+		</property>
+		<property name="lowerBound" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`lowerbound`"/>
+		</property>
+		<property name="upperBound" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`upperbound`"/>
+		</property>
 		<many-to-one name="eType" entity-name="EClassifier" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`eclassifier_etype_id`"/>
 		</many-to-one>
 	</subclass>
 	<subclass entity-name="EStructuralFeature" abstract="true" lazy="false" extends="ETypedElement" discriminator-value="EStructuralFeature">
-		<property name="changeable" type="boolean" lazy="false" column="`changeable`" not-null="false"/>
-		<property name="volatile" type="boolean" lazy="false" column="`volatile`" not-null="false"/>
-		<property name="transient" type="boolean" lazy="false" column="`transient`" not-null="false"/>
-		<property name="defaultValueLiteral" type="java.lang.String" lazy="false" column="`defaultvalueliteral`" not-null="false"/>
-		<property name="unsettable" type="boolean" lazy="false" column="`unsettable`" not-null="false"/>
-		<property name="derived" type="boolean" lazy="false" column="`derived`" not-null="false"/>
+		<meta attribute="eclassName">EStructuralFeature</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<property name="changeable" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`changeable`"/>
+		</property>
+		<property name="volatile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`volatile`"/>
+		</property>
+		<property name="transient" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`transient`"/>
+		</property>
+		<property name="defaultValueLiteral" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`defaultvalueliteral`"/>
+		</property>
+		<property name="unsettable" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`unsettable`"/>
+		</property>
+		<property name="derived" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`derived`"/>
+		</property>
 		<many-to-one name="eContainingClass" entity-name="EClass" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
 			<column not-null="false" unique="false" name="`estructuralfeature_econtainingclass_id`"/>
 		</many-to-one>
 	</subclass>
 	<subclass entity-name="EAttribute" abstract="false" lazy="false" extends="EStructuralFeature" discriminator-value="EAttribute">
-		<property name="iD" type="boolean" lazy="false" column="`id`" not-null="false"/>
+		<meta attribute="eclassName">EAttribute</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<property name="iD" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`id`"/>
+		</property>
 	</subclass>
 	<subclass entity-name="EAnnotation" abstract="false" lazy="false" extends="EModelElement" discriminator-value="EAnnotation">
-		<property name="source" type="java.lang.String" lazy="false" column="`source`" not-null="false"/>
+		<meta attribute="eclassName">EAnnotation</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<property name="source" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`source`"/>
+		</property>
 		<list name="details" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`eannotation_details_id`" not-null="false" unique="false"/>
@@ -57,30 +156,42 @@
 		<many-to-one name="eModelElement" entity-name="EModelElement" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
 			<column not-null="false" unique="false" name="`eannotation_emodelelement_id`"/>
 		</many-to-one>
-		<list name="contents" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`eannotation_contents_id`" not-null="false" unique="false"/>
-			</key>
+		<list name="contents" table="eannotation_contents" lazy="true" cascade="all,delete-orphan">
+			<key/>
 			<list-index column="`eannotation_contents_idx`"/>
-			<one-to-many entity-name="EObject"/>
+			<many-to-any id-type="long">
+				<column not-null="true" unique="false" name="`contents_type`"/>
+				<column not-null="true" unique="false" name="`contents_id`"/>
+			</many-to-any>
 		</list>
-		<list name="references" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true">
-				<column name="`eannotation_references_id`" not-null="false" unique="false"/>
-			</key>
+		<list name="references" table="eannotation_references" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key/>
 			<list-index column="`eannotation_references_idx`"/>
-			<one-to-many entity-name="EObject"/>
+			<many-to-any id-type="long">
+				<column not-null="true" unique="false" name="`references_type`"/>
+				<column not-null="true" unique="false" name="`references_id`"/>
+			</many-to-any>
 		</list>
 	</subclass>
 	<subclass entity-name="EClassifier" abstract="true" lazy="false" extends="ENamedElement" discriminator-value="EClassifier">
-		<property name="instanceClassName" type="java.lang.String" lazy="false" column="`instanceclassname`" not-null="false"/>
+		<meta attribute="eclassName">EClassifier</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<property name="instanceClassName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`instanceclassname`"/>
+		</property>
 		<many-to-one name="ePackage" entity-name="EPackage" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
 			<column not-null="false" unique="false" name="`eclassifier_epackage_id`"/>
 		</many-to-one>
 	</subclass>
 	<subclass entity-name="EClass" abstract="false" lazy="false" extends="EClassifier" discriminator-value="EClass">
-		<property name="abstract" type="boolean" lazy="false" column="`abstract`" not-null="false"/>
-		<property name="interface" type="boolean" lazy="false" column="`interface`" not-null="false"/>
+		<meta attribute="eclassName">EClass</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<property name="abstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`abstract`"/>
+		</property>
+		<property name="interface" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`interface`"/>
+		</property>
 		<list name="eSuperTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh">
 			<key update="true">
 				<column name="`eclass_esupertypes_id`" not-null="false" unique="false"/>
@@ -104,9 +215,15 @@
 		</list>
 	</subclass>
 	<subclass entity-name="EDataType" abstract="false" lazy="false" extends="EClassifier" discriminator-value="EDataType">
-		<property name="serializable" type="boolean" lazy="false" column="`serializable`" not-null="false"/>
+		<meta attribute="eclassName">EDataType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<property name="serializable" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`serializable`"/>
+		</property>
 	</subclass>
 	<subclass entity-name="EEnum" abstract="false" lazy="false" extends="EDataType" discriminator-value="EEnum">
+		<meta attribute="eclassName">EEnum</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<list name="eLiterals" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`eenumliteral_eenum_id`" not-null="false" unique="false"/>
@@ -116,14 +233,25 @@
 		</list>
 	</subclass>
 	<subclass entity-name="EEnumLiteral" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="EEnumLiteral">
-		<property name="value" type="int" lazy="false" column="`value`" not-null="false"/>
-		<property name="literal" type="java.lang.String" lazy="false" column="`literal`" not-null="false"/>
+		<meta attribute="eclassName">EEnumLiteral</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+		<property name="literal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`literal`"/>
+		</property>
 		<many-to-one name="eEnum" entity-name="EEnum" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
 			<column not-null="false" unique="false" name="`eenumliteral_eenum_id`"/>
 		</many-to-one>
 	</subclass>
-	<subclass entity-name="EFactory" abstract="false" lazy="false" extends="EModelElement" discriminator-value="EFactory"/>
+	<subclass entity-name="EFactory" abstract="false" lazy="false" extends="EModelElement" discriminator-value="EFactory">
+		<meta attribute="eclassName">EFactory</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+	</subclass>
 	<subclass entity-name="EOperation" abstract="false" lazy="false" extends="ETypedElement" discriminator-value="EOperation">
+		<meta attribute="eclassName">EOperation</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<many-to-one name="eContainingClass" entity-name="EClass" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
 			<column not-null="false" unique="false" name="`eoperation_econtainingclass_id`"/>
 		</many-to-one>
@@ -143,8 +271,14 @@
 		</list>
 	</subclass>
 	<subclass entity-name="EPackage" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="EPackage">
-		<property name="nsURI" type="java.lang.String" lazy="false" column="`nsuri`" not-null="false"/>
-		<property name="nsPrefix" type="java.lang.String" lazy="false" column="`nsprefix`" not-null="false"/>
+		<meta attribute="eclassName">EPackage</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<property name="nsURI" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`nsuri`"/>
+		</property>
+		<property name="nsPrefix" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`nsprefix`"/>
+		</property>
 		<list name="eClassifiers" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`eclassifier_epackage_id`" not-null="false" unique="false"/>
@@ -164,29 +298,52 @@
 		</many-to-one>
 	</subclass>
 	<subclass entity-name="EParameter" abstract="false" lazy="false" extends="ETypedElement" discriminator-value="EParameter">
+		<meta attribute="eclassName">EParameter</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<many-to-one name="eOperation" entity-name="EOperation" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
 			<column not-null="false" unique="false" name="`eparameter_eoperation_id`"/>
 		</many-to-one>
 	</subclass>
 	<subclass entity-name="EReference" abstract="false" lazy="false" extends="EStructuralFeature" discriminator-value="EReference">
-		<property name="containment" type="boolean" lazy="false" column="`containment`" not-null="false"/>
-		<property name="resolveProxies" type="boolean" lazy="false" column="`resolveproxies`" not-null="false"/>
+		<meta attribute="eclassName">EReference</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<property name="containment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`containment`"/>
+		</property>
+		<property name="resolveProxies" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`resolveproxies`"/>
+		</property>
 		<many-to-one name="eOpposite" entity-name="EReference" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`ereference_eopposite_id`"/>
 		</many-to-one>
 	</subclass>
 	<class entity-name="EStringToStringMapEntry" abstract="false" lazy="false" discriminator-value="EStringToStringMapEntry" table="`estringtostringmapentry`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">EStringToStringMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</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"/>
-		<property name="key" type="java.lang.String" lazy="false" column="`key`" not-null="false"/>
-		<property name="value" type="java.lang.String" lazy="false" column="`value`" not-null="false"/>
+		<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" 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" 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>
 	<subclass entity-name="View" abstract="true" lazy="false" extends="EModelElement" discriminator-value="View">
-		<property name="visible" type="boolean" lazy="false" column="`visible`" not-null="false"/>
-		<property name="type" type="java.lang.String" lazy="false" column="`type`" not-null="false"/>
+		<meta attribute="eclassName">View</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="visible" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`visible`"/>
+		</property>
+		<property name="type" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`type`"/>
+		</property>
 		<list name="children" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`view_children_id`" not-null="false" unique="false"/>
@@ -201,11 +358,14 @@
 			<list-index column="`view_styles_idx`"/>
 			<one-to-many entity-name="Style"/>
 		</list>
-		<many-to-one name="element" entity-name="EObject" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`eobject_element_id`"/>
-		</many-to-one>
+		<any name="element" id-type="long" cascade="merge,persist,save-update,lock,refresh">
+			<column not-null="false" unique="false" name="`element_type`"/>
+			<column not-null="false" unique="false" name="`element_id`"/>
+		</any>
 	</subclass>
 	<subclass entity-name="Edge" abstract="false" lazy="false" extends="View" discriminator-value="Edge">
+		<meta attribute="eclassName">Edge</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<many-to-one name="source" entity-name="View" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
 			<column not-null="false" unique="false" name="`edge_source_id`"/>
 		</many-to-one>
@@ -223,128 +383,230 @@
 		</many-to-one>
 	</subclass>
 	<subclass entity-name="Node" abstract="false" lazy="false" extends="View" discriminator-value="Node">
+		<meta attribute="eclassName">Node</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<many-to-one name="layoutConstraint" entity-name="LayoutConstraint" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`layoutconstraint_layoutconstraint_id`"/>
 		</many-to-one>
 	</subclass>
 	<class entity-name="Style" abstract="true" lazy="false" discriminator-value="Style" table="`style`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">Style</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</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"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
 	</class>
 	<subclass entity-name="FillStyle" abstract="false" lazy="false" extends="Style" discriminator-value="FillStyle">
-		<property name="fillColor" type="int" lazy="false" column="`fillcolor`" not-null="false"/>
+		<meta attribute="eclassName">FillStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="fillColor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`fillcolor`"/>
+		</property>
 	</subclass>
 	<subclass entity-name="LineStyle" abstract="false" lazy="false" extends="Style" discriminator-value="LineStyle">
-		<property name="lineColor" type="int" lazy="false" column="`linecolor`" not-null="false"/>
+		<meta attribute="eclassName">LineStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="lineColor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`linecolor`"/>
+		</property>
 	</subclass>
 	<subclass entity-name="FontStyle" abstract="false" lazy="false" extends="Style" discriminator-value="FontStyle">
-		<property name="fontColor" type="int" lazy="false" column="`fontcolor`" not-null="false"/>
-		<property name="fontName" type="java.lang.String" lazy="false" column="`fontname`" not-null="false"/>
-		<property name="fontHeight" type="int" lazy="false" column="`fontheight`" not-null="false"/>
-		<property name="bold" type="boolean" lazy="false" column="`bold`" not-null="false"/>
-		<property name="italic" type="boolean" lazy="false" column="`italic`" not-null="false"/>
-		<property name="underline" type="boolean" lazy="false" column="`underline`" not-null="false"/>
-		<property name="strikeThrough" type="boolean" lazy="false" column="`strikethrough`" not-null="false"/>
+		<meta attribute="eclassName">FontStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="fontColor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`fontcolor`"/>
+		</property>
+		<property name="fontName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`fontname`"/>
+		</property>
+		<property name="fontHeight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`fontheight`"/>
+		</property>
+		<property name="bold" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`bold`"/>
+		</property>
+		<property name="italic" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`italic`"/>
+		</property>
+		<property name="underline" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`underline`"/>
+		</property>
+		<property name="strikeThrough" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`strikethrough`"/>
+		</property>
 	</subclass>
 	<subclass entity-name="TitleStyle" abstract="false" lazy="false" extends="Style" discriminator-value="TitleStyle">
-		<property name="showTitle" type="boolean" lazy="false" column="`showtitle`" not-null="false"/>
+		<meta attribute="eclassName">TitleStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="showTitle" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`showtitle`"/>
+		</property>
 	</subclass>
 	<subclass entity-name="SortingStyle" abstract="false" lazy="false" extends="Style" discriminator-value="SortingStyle">
-		<property name="sorting" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`sorting`" not-null="false" unique="true">
+		<meta attribute="eclassName">SortingStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="sorting" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`sorting`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.Sorting</param>
 			</type>
 		</property>
-		<list name="sortedObjects" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true">
-				<column name="`sortingstyle_sortedobjects_id`" not-null="false" unique="false"/>
-			</key>
+		<property name="sortingKeys" lazy="false" insert="true" update="true" not-null="false" unique="false" type="notation.SortKeyMap">
+			<column not-null="false" unique="false" name="`sortingkeys`"/>
+		</property>
+		<list name="sortedObjects" table="sortingstyle_sortedobjects" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key/>
 			<list-index column="`sortingstyle_sortedobjects_idx`"/>
-			<one-to-many entity-name="EObject"/>
+			<many-to-any id-type="long">
+				<column not-null="true" unique="false" name="`sortedobjects_type`"/>
+				<column not-null="true" unique="false" name="`sortedobjects_id`"/>
+			</many-to-any>
 		</list>
 	</subclass>
 	<subclass entity-name="DescriptionStyle" abstract="false" lazy="false" extends="Style" discriminator-value="DescriptionStyle">
-		<property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/>
+		<meta attribute="eclassName">DescriptionStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<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>
 	</subclass>
 	<class entity-name="LayoutConstraint" abstract="true" lazy="false" discriminator-value="LayoutConstraint" table="`layoutconstraint`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">LayoutConstraint</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</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"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
 	</class>
 	<subclass entity-name="Size" abstract="false" lazy="false" extends="LayoutConstraint" discriminator-value="Size">
-		<property name="width" type="int" lazy="false" column="`width`" not-null="false"/>
-		<property name="height" type="int" lazy="false" column="`height`" not-null="false"/>
+		<meta attribute="eclassName">Size</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<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" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`height`"/>
+		</property>
 	</subclass>
 	<subclass entity-name="Location" abstract="false" lazy="false" extends="LayoutConstraint" discriminator-value="Location">
-		<property name="x" type="int" lazy="false" column="`x`" not-null="false"/>
-		<property name="y" type="int" lazy="false" column="`y`" not-null="false"/>
+		<meta attribute="eclassName">Location</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<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" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`y`"/>
+		</property>
 	</subclass>
 	<subclass entity-name="Bounds" abstract="false" lazy="false" extends="Location" discriminator-value="Bounds">
-		<property name="width" type="int" lazy="false" column="`width`" not-null="false"/>
-		<property name="height" type="int" lazy="false" column="`height`" not-null="false"/>
+		<meta attribute="eclassName">Bounds</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<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" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`height`"/>
+		</property>
 	</subclass>
 	<subclass entity-name="Ratio" abstract="false" lazy="false" extends="LayoutConstraint" discriminator-value="Ratio">
-		<property name="value" type="double" lazy="false" column="`value`" not-null="false"/>
+		<meta attribute="eclassName">Ratio</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<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>
 	</subclass>
 	<class entity-name="Anchor" abstract="true" lazy="false" discriminator-value="Anchor" table="`anchor`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">Anchor</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</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"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
 	</class>
 	<class entity-name="Bendpoints" abstract="true" lazy="false" discriminator-value="Bendpoints" table="`bendpoints`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">Bendpoints</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</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"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
 	</class>
 	<subclass entity-name="IdentityAnchor" abstract="false" lazy="false" extends="Anchor" discriminator-value="IdentityAnchor">
-		<property name="id" type="java.lang.String" lazy="false" column="`id`" not-null="false"/>
+		<meta attribute="eclassName">IdentityAnchor</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`id`"/>
+		</property>
 	</subclass>
 	<subclass entity-name="RoutingStyle" abstract="false" lazy="false" extends="Style" discriminator-value="RoutingStyle">
-		<property name="routing" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`routing`" not-null="false" unique="true">
+		<meta attribute="eclassName">RoutingStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="routing" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`routing`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.Routing</param>
 			</type>
 		</property>
-		<property name="smoothness" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`smoothness`" not-null="false" unique="true">
+		<property name="smoothness" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`smoothness`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.Smoothness</param>
 			</type>
 		</property>
-		<property name="avoidObstructions" type="boolean" lazy="false" column="`avoidobstructions`" not-null="false"/>
-		<property name="closestDistance" type="boolean" lazy="false" column="`closestdistance`" not-null="false"/>
-		<property name="jumpLinkStatus" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`jumplinkstatus`" not-null="false" unique="true">
+		<property name="avoidObstructions" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`avoidobstructions`"/>
+		</property>
+		<property name="closestDistance" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`closestdistance`"/>
+		</property>
+		<property name="jumpLinkStatus" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`jumplinkstatus`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.JumpLinkStatus</param>
 			</type>
 		</property>
-		<property name="jumpLinkType" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`jumplinktype`" not-null="false" unique="true">
+		<property name="jumpLinkType" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`jumplinktype`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.JumpLinkType</param>
 			</type>
 		</property>
-		<property name="jumpLinksReverse" type="boolean" lazy="false" column="`jumplinksreverse`" not-null="false"/>
+		<property name="jumpLinksReverse" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`jumplinksreverse`"/>
+		</property>
 	</subclass>
 	<subclass entity-name="RelativeBendpoints" abstract="false" lazy="false" extends="Bendpoints" discriminator-value="RelativeBendpoints">
-		<list name="points" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`relativebendpoints_points_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`relativebendpoints_points_idx`"/>
-			<element type="org.eclipse.gmf.runtime.notation.Edge"/>
-		</list>
+		<meta attribute="eclassName">RelativeBendpoints</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="points" lazy="false" insert="true" update="true" not-null="false" unique="false" type="notation.RelativeBendpointList">
+			<column not-null="false" unique="false" name="`points`"/>
+		</property>
 	</subclass>
 	<subclass entity-name="Diagram" abstract="false" lazy="false" extends="View" discriminator-value="Diagram">
-		<property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/>
-		<property name="measurementUnit" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`measurementunit`" not-null="false" unique="true">
+		<meta attribute="eclassName">Diagram</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<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="measurementUnit" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`measurementunit`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.MeasurementUnit</param>
 			</type>
@@ -358,11 +620,16 @@
 		</list>
 	</subclass>
 	<class entity-name="Image" abstract="false" lazy="false" discriminator-value="Image" table="`image`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">Image</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</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"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
 		<array name="data" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`image_data_id`" not-null="true" unique="false"/>
@@ -372,56 +639,112 @@
 		</array>
 	</class>
 	<subclass entity-name="CanonicalStyle" abstract="false" lazy="false" extends="Style" discriminator-value="CanonicalStyle">
-		<property name="canonical" type="boolean" lazy="false" column="`canonical`" not-null="false"/>
-	</subclass>
-	<subclass entity-name="ShapeStyle" abstract="false" lazy="false" extends="EObject" discriminator-value="ShapeStyle">
-		<property name="fontColor" type="int" lazy="false" column="`fontcolor`" not-null="false"/>
-		<property name="fontName" type="java.lang.String" lazy="false" column="`fontname`" not-null="false"/>
-		<property name="fontHeight" type="int" lazy="false" column="`fontheight`" not-null="false"/>
-		<property name="bold" type="boolean" lazy="false" column="`bold`" not-null="false"/>
-		<property name="italic" type="boolean" lazy="false" column="`italic`" not-null="false"/>
-		<property name="underline" type="boolean" lazy="false" column="`underline`" not-null="false"/>
-		<property name="strikeThrough" type="boolean" lazy="false" column="`strikethrough`" not-null="false"/>
-		<property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/>
-		<property name="fillColor" type="int" lazy="false" column="`fillcolor`" not-null="false"/>
-		<property name="lineColor" type="int" lazy="false" column="`linecolor`" not-null="false"/>
-	</subclass>
-	<subclass entity-name="ConnectorStyle" abstract="false" lazy="false" extends="EObject" discriminator-value="ConnectorStyle">
-		<property name="routing" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`routing`" not-null="false" unique="true">
+		<meta attribute="eclassName">CanonicalStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="canonical" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`canonical`"/>
+		</property>
+	</subclass>
+	<subclass entity-name="ShapeStyle" abstract="false" lazy="false" extends="http://www.eclipse.org/emf/2002/Ecore/EObject" discriminator-value="ShapeStyle">
+		<meta attribute="eclassName">ShapeStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="fontColor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`fontcolor`"/>
+		</property>
+		<property name="fontName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`fontname`"/>
+		</property>
+		<property name="fontHeight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`fontheight`"/>
+		</property>
+		<property name="bold" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`bold`"/>
+		</property>
+		<property name="italic" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`italic`"/>
+		</property>
+		<property name="underline" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`underline`"/>
+		</property>
+		<property name="strikeThrough" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`strikethrough`"/>
+		</property>
+		<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>
+		<property name="fillColor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`fillcolor`"/>
+		</property>
+		<property name="lineColor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`linecolor`"/>
+		</property>
+	</subclass>
+	<subclass entity-name="ConnectorStyle" abstract="false" lazy="false" extends="http://www.eclipse.org/emf/2002/Ecore/EObject" discriminator-value="ConnectorStyle">
+		<meta attribute="eclassName">ConnectorStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="routing" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`routing`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.Routing</param>
 			</type>
 		</property>
-		<property name="smoothness" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`smoothness`" not-null="false" unique="true">
+		<property name="smoothness" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`smoothness`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.Smoothness</param>
 			</type>
 		</property>
-		<property name="avoidObstructions" type="boolean" lazy="false" column="`avoidobstructions`" not-null="false"/>
-		<property name="closestDistance" type="boolean" lazy="false" column="`closestdistance`" not-null="false"/>
-		<property name="jumpLinkStatus" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`jumplinkstatus`" not-null="false" unique="true">
+		<property name="avoidObstructions" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`avoidobstructions`"/>
+		</property>
+		<property name="closestDistance" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`closestdistance`"/>
+		</property>
+		<property name="jumpLinkStatus" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`jumplinkstatus`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.JumpLinkStatus</param>
 			</type>
 		</property>
-		<property name="jumpLinkType" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`jumplinktype`" not-null="false" unique="true">
+		<property name="jumpLinkType" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`jumplinktype`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.JumpLinkType</param>
 			</type>
 		</property>
-		<property name="jumpLinksReverse" type="boolean" lazy="false" column="`jumplinksreverse`" not-null="false"/>
-		<property name="lineColor" type="int" lazy="false" column="`linecolor`" not-null="false"/>
+		<property name="jumpLinksReverse" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`jumplinksreverse`"/>
+		</property>
+		<property name="lineColor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`linecolor`"/>
+		</property>
 	</subclass>
 	<subclass entity-name="PageStyle" abstract="false" lazy="false" extends="Style" discriminator-value="PageStyle">
-		<property name="pageX" type="int" lazy="false" column="`pagex`" not-null="false"/>
-		<property name="pageY" type="int" lazy="false" column="`pagey`" not-null="false"/>
-		<property name="pageWidth" type="int" lazy="false" column="`pagewidth`" not-null="false"/>
-		<property name="pageHeight" type="int" lazy="false" column="`pageheight`" not-null="false"/>
+		<meta attribute="eclassName">PageStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="pageX" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pagex`"/>
+		</property>
+		<property name="pageY" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pagey`"/>
+		</property>
+		<property name="pageWidth" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pagewidth`"/>
+		</property>
+		<property name="pageHeight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pageheight`"/>
+		</property>
 	</subclass>
 	<subclass entity-name="DrawerStyle" abstract="false" lazy="false" extends="Style" discriminator-value="DrawerStyle">
-		<property name="collapsed" type="boolean" lazy="false" column="`collapsed`" not-null="false"/>
+		<meta attribute="eclassName">DrawerStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="collapsed" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`collapsed`"/>
+		</property>
 	</subclass>
 	<subclass entity-name="GuideStyle" abstract="false" lazy="false" extends="Style" discriminator-value="GuideStyle">
+		<meta attribute="eclassName">GuideStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<list name="horizontalGuides" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`guidestyle_horizontalguides_id`" not-null="false" unique="false"/>
@@ -438,12 +761,19 @@
 		</list>
 	</subclass>
 	<class entity-name="Guide" abstract="false" lazy="false" discriminator-value="Guide" table="`guide`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">Guide</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</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"/>
-		<property name="position" type="int" lazy="false" column="`position`" not-null="false"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="position" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`position`"/>
+		</property>
 		<list name="nodeMap" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`guide_nodemap_id`" not-null="false" unique="false"/>
@@ -453,12 +783,18 @@
 		</list>
 	</class>
 	<class entity-name="NodeEntry" abstract="false" lazy="false" discriminator-value="NodeEntry" table="`nodeentry`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">NodeEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</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"/>
-		<property name="value" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`value`" not-null="false" unique="true">
+		<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" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`value`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.Alignment</param>
 			</type>
@@ -468,31 +804,41 @@
 		</many-to-one>
 	</class>
 	<subclass entity-name="FilteringStyle" abstract="false" lazy="false" extends="Style" discriminator-value="FilteringStyle">
-		<property name="filtering" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`filtering`" not-null="false" unique="true">
+		<meta attribute="eclassName">FilteringStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="filtering" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`filtering`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.Filtering</param>
 			</type>
 		</property>
-		<list name="filteringKeys" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`filteringstyle_filteringkeys_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`filteringstyle_filteringkeys_idx`"/>
-			<element type="org.eclipse.gmf.runtime.notation.Edge"/>
-		</list>
-		<list name="filteredObjects" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true">
-				<column name="`filteringstyle_filteredobjects_id`" not-null="false" unique="false"/>
-			</key>
+		<property name="filteringKeys" lazy="false" insert="true" update="true" not-null="false" unique="false" type="notation.FilterKeyList">
+			<column not-null="false" unique="false" name="`filteringkeys`"/>
+		</property>
+		<list name="filteredObjects" table="filteringstyle_filteredobjects" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key/>
 			<list-index column="`filteringstyle_filteredobjects_idx`"/>
-			<one-to-many entity-name="EObject"/>
+			<many-to-any id-type="long">
+				<column not-null="true" unique="false" name="`filteredobjects_type`"/>
+				<column not-null="true" unique="false" name="`filteredobjects_id`"/>
+			</many-to-any>
 		</list>
 	</subclass>
-	<subclass entity-name="DiagramStyle" abstract="false" lazy="false" extends="EObject" discriminator-value="DiagramStyle">
-		<property name="pageX" type="int" lazy="false" column="`pagex`" not-null="false"/>
-		<property name="pageY" type="int" lazy="false" column="`pagey`" not-null="false"/>
-		<property name="pageWidth" type="int" lazy="false" column="`pagewidth`" not-null="false"/>
-		<property name="pageHeight" type="int" lazy="false" column="`pageheight`" not-null="false"/>
+	<subclass entity-name="DiagramStyle" abstract="false" lazy="false" extends="http://www.eclipse.org/emf/2002/Ecore/EObject" discriminator-value="DiagramStyle">
+		<meta attribute="eclassName">DiagramStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="pageX" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pagex`"/>
+		</property>
+		<property name="pageY" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pagey`"/>
+		</property>
+		<property name="pageWidth" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pagewidth`"/>
+		</property>
+		<property name="pageHeight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pageheight`"/>
+		</property>
 		<list name="horizontalGuides" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`guidestyle_horizontalguides_id`" not-null="false" unique="false"/>
@@ -507,18 +853,246 @@
 			<list-index column="`guidestyle_verticalguides_idx`"/>
 			<one-to-many entity-name="Guide"/>
 		</list>
-		<property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="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>
 	</subclass>
 	<subclass entity-name="ImageStyle" abstract="false" lazy="false" extends="Style" discriminator-value="ImageStyle">
-		<property name="antiAlias" type="java.lang.Boolean" lazy="false" column="`antialias`" not-null="false"/>
-		<property name="maintainAspectRatio" type="java.lang.Boolean" lazy="false" column="`maintainaspectratio`" not-null="false"/>
+		<meta attribute="eclassName">ImageStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
+		<property name="antiAlias" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
+			<column not-null="false" unique="false" name="`antialias`"/>
+		</property>
+		<property name="maintainAspectRatio" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
+			<column not-null="false" unique="false" name="`maintainaspectratio`"/>
+		</property>
 		<many-to-one name="cropBound" entity-name="Bounds" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`bounds_cropbound_id`"/>
 		</many-to-one>
 	</subclass>
 	<subclass entity-name="ImageBufferStyle" abstract="false" lazy="false" extends="ImageStyle" discriminator-value="ImageBufferStyle">
+		<meta attribute="eclassName">ImageBufferStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<many-to-one name="imageBuffer" entity-name="Image" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`image_imagebuffer_id`"/>
 		</many-to-one>
 	</subclass>
+	<class entity-name="Map" abstract="false" lazy="false" discriminator-value="Map" table="`map`">
+		<meta attribute="eclassName">Map</meta>
+		<meta attribute="epackage">http://www.example.org/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.example.org/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.example.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.example.org/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.example.org/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.example.org/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.example.org/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.example.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.GMFNotationAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.GMFNotationAction/mysql_s_o/hibernate.hbm.xml
index 7f83e1e40..28363a61e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.GMFNotationAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.GMFNotationAction/mysql_s_o/hibernate.hbm.xml
@@ -1,15 +1,78 @@
 <?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 Oct 17 15:53:33 CEST 2006 -->
+<!--	Generated by Teneo on Mon Nov 20 15:04:44 CET 2006 -->
 <hibernate-mapping>
-	<class entity-name="EObject" abstract="false" lazy="false" table="`eobject`">
-		<id type="long" name="e_id" column="e_id">
+	<typedef name="ecore.EDiagnosticChain" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EDiagnosticChain</param>
+	</typedef>
+	<typedef name="ecore.EEList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EEList</param>
+	</typedef>
+	<typedef name="ecore.EEnumerator" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EEnumerator</param>
+	</typedef>
+	<typedef name="ecore.EFeatureMap" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EFeatureMap</param>
+	</typedef>
+	<typedef name="ecore.EFeatureMapEntry" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EFeatureMapEntry</param>
+	</typedef>
+	<typedef name="ecore.EMap" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EMap</param>
+	</typedef>
+	<typedef name="ecore.EResource" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EResource</param>
+	</typedef>
+	<typedef name="ecore.EResourceSet" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EResourceSet</param>
+	</typedef>
+	<typedef name="ecore.ETreeIterator" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">ETreeIterator</param>
+	</typedef>
+	<typedef name="notation.RelativeBendpointList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</param>
+		<param name="edatatype">RelativeBendpointList</param>
+	</typedef>
+	<typedef name="notation.FilterKeyList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</param>
+		<param name="edatatype">FilterKeyList</param>
+	</typedef>
+	<typedef name="notation.SortKeyMap" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</param>
+		<param name="edatatype">SortKeyMap</param>
+	</typedef>
+	<typedef name="mindmap.PriorityObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.example.org/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.example.org/mindmap</param>
+		<param name="edatatype">RelationshipTypeObject</param>
+	</typedef>
+	<class entity-name="http://www.eclipse.org/emf/2002/Ecore/EObject" abstract="false" lazy="false" table="`eobject`">
+		<meta attribute="eclassName">EObject</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</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"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
 	</class>
-	<joined-subclass entity-name="EModelElement" abstract="true" lazy="false" extends="EObject" table="`emodelelement`">
+	<joined-subclass entity-name="EModelElement" abstract="true" lazy="false" extends="http://www.eclipse.org/emf/2002/Ecore/EObject" table="`emodelelement`">
+		<meta attribute="eclassName">EModelElement</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`eobject_id`"/>
 		</key>
@@ -22,48 +85,84 @@
 		</list>
 	</joined-subclass>
 	<joined-subclass entity-name="ENamedElement" abstract="true" lazy="false" extends="EModelElement" table="`enamedelement`">
+		<meta attribute="eclassName">ENamedElement</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`emodelelement_id`"/>
 		</key>
-		<property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="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>
 	</joined-subclass>
 	<joined-subclass entity-name="ETypedElement" abstract="true" lazy="false" extends="ENamedElement" table="`etypedelement`">
+		<meta attribute="eclassName">ETypedElement</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`enamedelement_id`"/>
 		</key>
-		<property name="ordered" type="boolean" lazy="false" column="`ordered`" not-null="false"/>
-		<property name="unique" type="boolean" lazy="false" column="`unique`" not-null="false"/>
-		<property name="lowerBound" type="int" lazy="false" column="`lowerbound`" not-null="false"/>
-		<property name="upperBound" type="int" lazy="false" column="`upperbound`" not-null="false"/>
+		<property name="ordered" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`ordered`"/>
+		</property>
+		<property name="unique" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`unique`"/>
+		</property>
+		<property name="lowerBound" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`lowerbound`"/>
+		</property>
+		<property name="upperBound" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`upperbound`"/>
+		</property>
 		<many-to-one name="eType" entity-name="EClassifier" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`eclassifier_etype_id`"/>
 		</many-to-one>
 	</joined-subclass>
 	<joined-subclass entity-name="EStructuralFeature" abstract="true" lazy="false" extends="ETypedElement" table="`estructuralfeature`">
+		<meta attribute="eclassName">EStructuralFeature</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`etypedelement_id`"/>
 		</key>
-		<property name="changeable" type="boolean" lazy="false" column="`changeable`" not-null="false"/>
-		<property name="volatile" type="boolean" lazy="false" column="`volatile`" not-null="false"/>
-		<property name="transient" type="boolean" lazy="false" column="`transient`" not-null="false"/>
-		<property name="defaultValueLiteral" type="java.lang.String" lazy="false" column="`defaultvalueliteral`" not-null="false"/>
-		<property name="unsettable" type="boolean" lazy="false" column="`unsettable`" not-null="false"/>
-		<property name="derived" type="boolean" lazy="false" column="`derived`" not-null="false"/>
+		<property name="changeable" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`changeable`"/>
+		</property>
+		<property name="volatile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`volatile`"/>
+		</property>
+		<property name="transient" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`transient`"/>
+		</property>
+		<property name="defaultValueLiteral" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`defaultvalueliteral`"/>
+		</property>
+		<property name="unsettable" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`unsettable`"/>
+		</property>
+		<property name="derived" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`derived`"/>
+		</property>
 		<many-to-one name="eContainingClass" entity-name="EClass" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
 			<column not-null="false" unique="false" name="`estructuralfeature_econtainingclass_id`"/>
 		</many-to-one>
 	</joined-subclass>
 	<joined-subclass entity-name="EAttribute" abstract="false" lazy="false" extends="EStructuralFeature" table="`eattribute`">
+		<meta attribute="eclassName">EAttribute</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`estructuralfeature_id`"/>
 		</key>
-		<property name="iD" type="boolean" lazy="false" column="`id`" not-null="false"/>
+		<property name="iD" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`id`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass entity-name="EAnnotation" abstract="false" lazy="false" extends="EModelElement" table="`eannotation`">
+		<meta attribute="eclassName">EAnnotation</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`emodelelement_id`"/>
 		</key>
-		<property name="source" type="java.lang.String" lazy="false" column="`source`" not-null="false"/>
+		<property name="source" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`source`"/>
+		</property>
 		<list name="details" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`eannotation_details_id`" not-null="false" unique="false"/>
@@ -74,36 +173,48 @@
 		<many-to-one name="eModelElement" entity-name="EModelElement" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
 			<column not-null="false" unique="false" name="`eannotation_emodelelement_id`"/>
 		</many-to-one>
-		<list name="contents" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`eannotation_contents_id`" not-null="false" unique="false"/>
-			</key>
+		<list name="contents" table="eannotation_contents" lazy="true" cascade="all,delete-orphan">
+			<key/>
 			<list-index column="`eannotation_contents_idx`"/>
-			<one-to-many entity-name="EObject"/>
+			<many-to-any id-type="long">
+				<column not-null="true" unique="false" name="`contents_type`"/>
+				<column not-null="true" unique="false" name="`contents_id`"/>
+			</many-to-any>
 		</list>
-		<list name="references" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true">
-				<column name="`eannotation_references_id`" not-null="false" unique="false"/>
-			</key>
+		<list name="references" table="eannotation_references" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key/>
 			<list-index column="`eannotation_references_idx`"/>
-			<one-to-many entity-name="EObject"/>
+			<many-to-any id-type="long">
+				<column not-null="true" unique="false" name="`references_type`"/>
+				<column not-null="true" unique="false" name="`references_id`"/>
+			</many-to-any>
 		</list>
 	</joined-subclass>
 	<joined-subclass entity-name="EClassifier" abstract="true" lazy="false" extends="ENamedElement" table="`eclassifier`">
+		<meta attribute="eclassName">EClassifier</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`enamedelement_id`"/>
 		</key>
-		<property name="instanceClassName" type="java.lang.String" lazy="false" column="`instanceclassname`" not-null="false"/>
+		<property name="instanceClassName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`instanceclassname`"/>
+		</property>
 		<many-to-one name="ePackage" entity-name="EPackage" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
 			<column not-null="false" unique="false" name="`eclassifier_epackage_id`"/>
 		</many-to-one>
 	</joined-subclass>
 	<joined-subclass entity-name="EClass" abstract="false" lazy="false" extends="EClassifier" table="`eclass`">
+		<meta attribute="eclassName">EClass</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`eclassifier_id`"/>
 		</key>
-		<property name="abstract" type="boolean" lazy="false" column="`abstract`" not-null="false"/>
-		<property name="interface" type="boolean" lazy="false" column="`interface`" not-null="false"/>
+		<property name="abstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`abstract`"/>
+		</property>
+		<property name="interface" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`interface`"/>
+		</property>
 		<list name="eSuperTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh">
 			<key update="true">
 				<column name="`eclass_esupertypes_id`" not-null="false" unique="false"/>
@@ -127,12 +238,18 @@
 		</list>
 	</joined-subclass>
 	<joined-subclass entity-name="EDataType" abstract="false" lazy="false" extends="EClassifier" table="`edatatype`">
+		<meta attribute="eclassName">EDataType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`eclassifier_id`"/>
 		</key>
-		<property name="serializable" type="boolean" lazy="false" column="`serializable`" not-null="false"/>
+		<property name="serializable" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`serializable`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass entity-name="EEnum" abstract="false" lazy="false" extends="EDataType" table="`eenum`">
+		<meta attribute="eclassName">EEnum</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`edatatype_id`"/>
 		</key>
@@ -145,21 +262,31 @@
 		</list>
 	</joined-subclass>
 	<joined-subclass entity-name="EEnumLiteral" abstract="false" lazy="false" extends="ENamedElement" table="`eenumliteral`">
+		<meta attribute="eclassName">EEnumLiteral</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`enamedelement_id`"/>
 		</key>
-		<property name="value" type="int" lazy="false" column="`value`" not-null="false"/>
-		<property name="literal" type="java.lang.String" lazy="false" column="`literal`" not-null="false"/>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+		<property name="literal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`literal`"/>
+		</property>
 		<many-to-one name="eEnum" entity-name="EEnum" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false">
 			<column not-null="false" unique="false" name="`eenumliteral_eenum_id`"/>
 		</many-to-one>
 	</joined-subclass>
 	<joined-subclass entity-name="EFactory" abstract="false" lazy="false" extends="EModelElement" table="`efactory`">
+		<meta attribute="eclassName">EFactory</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`emodelelement_id`"/>
 		</key>
 	</joined-subclass>
 	<joined-subclass entity-name="EOperation" abstract="false" lazy="false" extends="ETypedElement" table="`eoperation`">
+		<meta attribute="eclassName">EOperation</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`etypedelement_id`"/>
 		</key>
@@ -182,11 +309,17 @@
 		</list>
 	</joined-subclass>
 	<joined-subclass entity-name="EPackage" abstract="false" lazy="false" extends="ENamedElement" table="`epackage`">
+		<meta attribute="eclassName">EPackage</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`enamedelement_id`"/>
 		</key>
-		<property name="nsURI" type="java.lang.String" lazy="false" column="`nsuri`" not-null="false"/>
-		<property name="nsPrefix" type="java.lang.String" lazy="false" column="`nsprefix`" not-null="false"/>
+		<property name="nsURI" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`nsuri`"/>
+		</property>
+		<property name="nsPrefix" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`nsprefix`"/>
+		</property>
 		<list name="eClassifiers" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`eclassifier_epackage_id`" not-null="false" unique="false"/>
@@ -206,6 +339,8 @@
 		</many-to-one>
 	</joined-subclass>
 	<joined-subclass entity-name="EParameter" abstract="false" lazy="false" extends="ETypedElement" table="`eparameter`">
+		<meta attribute="eclassName">EParameter</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`etypedelement_id`"/>
 		</key>
@@ -214,29 +349,50 @@
 		</many-to-one>
 	</joined-subclass>
 	<joined-subclass entity-name="EReference" abstract="false" lazy="false" extends="EStructuralFeature" table="`ereference`">
+		<meta attribute="eclassName">EReference</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
 		<key>
 			<column name="`estructuralfeature_id`"/>
 		</key>
-		<property name="containment" type="boolean" lazy="false" column="`containment`" not-null="false"/>
-		<property name="resolveProxies" type="boolean" lazy="false" column="`resolveproxies`" not-null="false"/>
+		<property name="containment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`containment`"/>
+		</property>
+		<property name="resolveProxies" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`resolveproxies`"/>
+		</property>
 		<many-to-one name="eOpposite" entity-name="EReference" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`ereference_eopposite_id`"/>
 		</many-to-one>
 	</joined-subclass>
 	<class entity-name="EStringToStringMapEntry" abstract="false" lazy="false" table="`estringtostringmapentry`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">EStringToStringMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</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"/>
-		<property name="key" type="java.lang.String" lazy="false" column="`key`" not-null="false"/>
-		<property name="value" type="java.lang.String" lazy="false" column="`value`" not-null="false"/>
+		<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" 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" 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>
 	<joined-subclass entity-name="View" abstract="true" lazy="false" extends="EModelElement" table="`view`">
+		<meta attribute="eclassName">View</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`emodelelement_id`"/>
 		</key>
-		<property name="visible" type="boolean" lazy="false" column="`visible`" not-null="false"/>
-		<property name="type" type="java.lang.String" lazy="false" column="`type`" not-null="false"/>
+		<property name="visible" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`visible`"/>
+		</property>
+		<property name="type" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`type`"/>
+		</property>
 		<list name="children" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`view_children_id`" not-null="false" unique="false"/>
@@ -251,11 +407,14 @@
 			<list-index column="`view_styles_idx`"/>
 			<one-to-many entity-name="Style"/>
 		</list>
-		<many-to-one name="element" entity-name="EObject" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`eobject_element_id`"/>
-		</many-to-one>
+		<any name="element" id-type="long" cascade="merge,persist,save-update,lock,refresh">
+			<column not-null="false" unique="false" name="`element_type`"/>
+			<column not-null="false" unique="false" name="`element_id`"/>
+		</any>
 	</joined-subclass>
 	<joined-subclass entity-name="Edge" abstract="false" lazy="false" extends="View" table="`edge`">
+		<meta attribute="eclassName">Edge</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`view_id`"/>
 		</key>
@@ -276,6 +435,8 @@
 		</many-to-one>
 	</joined-subclass>
 	<joined-subclass entity-name="Node" abstract="false" lazy="false" extends="View" table="`node`">
+		<meta attribute="eclassName">Node</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`view_id`"/>
 		</key>
@@ -284,161 +445,261 @@
 		</many-to-one>
 	</joined-subclass>
 	<class entity-name="Style" abstract="true" lazy="false" table="`style`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">Style</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</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"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
 	</class>
 	<joined-subclass entity-name="FillStyle" abstract="false" lazy="false" extends="Style" table="`fillstyle`">
+		<meta attribute="eclassName">FillStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`style_id`"/>
 		</key>
-		<property name="fillColor" type="int" lazy="false" column="`fillcolor`" not-null="false"/>
+		<property name="fillColor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`fillcolor`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass entity-name="LineStyle" abstract="false" lazy="false" extends="Style" table="`linestyle`">
+		<meta attribute="eclassName">LineStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`style_id`"/>
 		</key>
-		<property name="lineColor" type="int" lazy="false" column="`linecolor`" not-null="false"/>
+		<property name="lineColor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`linecolor`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass entity-name="FontStyle" abstract="false" lazy="false" extends="Style" table="`fontstyle`">
+		<meta attribute="eclassName">FontStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`style_id`"/>
 		</key>
-		<property name="fontColor" type="int" lazy="false" column="`fontcolor`" not-null="false"/>
-		<property name="fontName" type="java.lang.String" lazy="false" column="`fontname`" not-null="false"/>
-		<property name="fontHeight" type="int" lazy="false" column="`fontheight`" not-null="false"/>
-		<property name="bold" type="boolean" lazy="false" column="`bold`" not-null="false"/>
-		<property name="italic" type="boolean" lazy="false" column="`italic`" not-null="false"/>
-		<property name="underline" type="boolean" lazy="false" column="`underline`" not-null="false"/>
-		<property name="strikeThrough" type="boolean" lazy="false" column="`strikethrough`" not-null="false"/>
+		<property name="fontColor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`fontcolor`"/>
+		</property>
+		<property name="fontName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`fontname`"/>
+		</property>
+		<property name="fontHeight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`fontheight`"/>
+		</property>
+		<property name="bold" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`bold`"/>
+		</property>
+		<property name="italic" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`italic`"/>
+		</property>
+		<property name="underline" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`underline`"/>
+		</property>
+		<property name="strikeThrough" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`strikethrough`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass entity-name="TitleStyle" abstract="false" lazy="false" extends="Style" table="`titlestyle`">
+		<meta attribute="eclassName">TitleStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`style_id`"/>
 		</key>
-		<property name="showTitle" type="boolean" lazy="false" column="`showtitle`" not-null="false"/>
+		<property name="showTitle" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`showtitle`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass entity-name="SortingStyle" abstract="false" lazy="false" extends="Style" table="`sortingstyle`">
+		<meta attribute="eclassName">SortingStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`style_id`"/>
 		</key>
-		<property name="sorting" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`sorting`" not-null="false" unique="true">
+		<property name="sorting" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`sorting`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.Sorting</param>
 			</type>
 		</property>
-		<list name="sortedObjects" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true">
-				<column name="`sortingstyle_sortedobjects_id`" not-null="false" unique="false"/>
-			</key>
+		<property name="sortingKeys" lazy="false" insert="true" update="true" not-null="false" unique="false" type="notation.SortKeyMap">
+			<column not-null="false" unique="false" name="`sortingkeys`"/>
+		</property>
+		<list name="sortedObjects" table="sortingstyle_sortedobjects" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key/>
 			<list-index column="`sortingstyle_sortedobjects_idx`"/>
-			<one-to-many entity-name="EObject"/>
+			<many-to-any id-type="long">
+				<column not-null="true" unique="false" name="`sortedobjects_type`"/>
+				<column not-null="true" unique="false" name="`sortedobjects_id`"/>
+			</many-to-any>
 		</list>
 	</joined-subclass>
 	<joined-subclass entity-name="DescriptionStyle" abstract="false" lazy="false" extends="Style" table="`descriptionstyle`">
+		<meta attribute="eclassName">DescriptionStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`style_id`"/>
 		</key>
-		<property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="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>
 	</joined-subclass>
 	<class entity-name="LayoutConstraint" abstract="true" lazy="false" table="`layoutconstraint`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">LayoutConstraint</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</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"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
 	</class>
 	<joined-subclass entity-name="Size" abstract="false" lazy="false" extends="LayoutConstraint" table="`size`">
+		<meta attribute="eclassName">Size</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`layoutconstraint_id`"/>
 		</key>
-		<property name="width" type="int" lazy="false" column="`width`" not-null="false"/>
-		<property name="height" type="int" lazy="false" column="`height`" not-null="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" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`height`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass entity-name="Location" abstract="false" lazy="false" extends="LayoutConstraint" table="`location`">
+		<meta attribute="eclassName">Location</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`layoutconstraint_id`"/>
 		</key>
-		<property name="x" type="int" lazy="false" column="`x`" not-null="false"/>
-		<property name="y" type="int" lazy="false" column="`y`" not-null="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" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`y`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass entity-name="Bounds" abstract="false" lazy="false" extends="Location" table="`bounds`">
+		<meta attribute="eclassName">Bounds</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`location_id`"/>
 		</key>
-		<property name="width" type="int" lazy="false" column="`width`" not-null="false"/>
-		<property name="height" type="int" lazy="false" column="`height`" not-null="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" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`height`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass entity-name="Ratio" abstract="false" lazy="false" extends="LayoutConstraint" table="`ratio`">
+		<meta attribute="eclassName">Ratio</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`layoutconstraint_id`"/>
 		</key>
-		<property name="value" type="double" lazy="false" column="`value`" not-null="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>
 	</joined-subclass>
 	<class entity-name="Anchor" abstract="true" lazy="false" table="`anchor`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">Anchor</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</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"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
 	</class>
 	<class entity-name="Bendpoints" abstract="true" lazy="false" table="`bendpoints`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">Bendpoints</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</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"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
 	</class>
 	<joined-subclass entity-name="IdentityAnchor" abstract="false" lazy="false" extends="Anchor" table="`identityanchor`">
+		<meta attribute="eclassName">IdentityAnchor</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`anchor_id`"/>
 		</key>
-		<property name="id" type="java.lang.String" lazy="false" column="`id`" not-null="false"/>
+		<property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`id`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass entity-name="RoutingStyle" abstract="false" lazy="false" extends="Style" table="`routingstyle`">
+		<meta attribute="eclassName">RoutingStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`style_id`"/>
 		</key>
-		<property name="routing" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`routing`" not-null="false" unique="true">
+		<property name="routing" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`routing`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.Routing</param>
 			</type>
 		</property>
-		<property name="smoothness" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`smoothness`" not-null="false" unique="true">
+		<property name="smoothness" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`smoothness`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.Smoothness</param>
 			</type>
 		</property>
-		<property name="avoidObstructions" type="boolean" lazy="false" column="`avoidobstructions`" not-null="false"/>
-		<property name="closestDistance" type="boolean" lazy="false" column="`closestdistance`" not-null="false"/>
-		<property name="jumpLinkStatus" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`jumplinkstatus`" not-null="false" unique="true">
+		<property name="avoidObstructions" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`avoidobstructions`"/>
+		</property>
+		<property name="closestDistance" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`closestdistance`"/>
+		</property>
+		<property name="jumpLinkStatus" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`jumplinkstatus`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.JumpLinkStatus</param>
 			</type>
 		</property>
-		<property name="jumpLinkType" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`jumplinktype`" not-null="false" unique="true">
+		<property name="jumpLinkType" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`jumplinktype`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.JumpLinkType</param>
 			</type>
 		</property>
-		<property name="jumpLinksReverse" type="boolean" lazy="false" column="`jumplinksreverse`" not-null="false"/>
+		<property name="jumpLinksReverse" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`jumplinksreverse`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass entity-name="RelativeBendpoints" abstract="false" lazy="false" extends="Bendpoints" table="`relativebendpoints`">
+		<meta attribute="eclassName">RelativeBendpoints</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`bendpoints_id`"/>
 		</key>
-		<list name="points" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`relativebendpoints_points_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`relativebendpoints_points_idx`"/>
-			<element type="org.eclipse.gmf.runtime.notation.Edge"/>
-		</list>
+		<property name="points" lazy="false" insert="true" update="true" not-null="false" unique="false" type="notation.RelativeBendpointList">
+			<column not-null="false" unique="false" name="`points`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass entity-name="Diagram" abstract="false" lazy="false" extends="View" table="`diagram`">
+		<meta attribute="eclassName">Diagram</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`view_id`"/>
 		</key>
-		<property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/>
-		<property name="measurementUnit" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`measurementunit`" not-null="false" unique="true">
+		<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="measurementUnit" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`measurementunit`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.MeasurementUnit</param>
 			</type>
@@ -452,10 +713,15 @@
 		</list>
 	</joined-subclass>
 	<class entity-name="Image" abstract="false" lazy="false" table="`image`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">Image</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</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"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
 		<array name="data" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`image_data_id`" not-null="true" unique="false"/>
@@ -465,71 +731,127 @@
 		</array>
 	</class>
 	<joined-subclass entity-name="CanonicalStyle" abstract="false" lazy="false" extends="Style" table="`canonicalstyle`">
+		<meta attribute="eclassName">CanonicalStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`style_id`"/>
 		</key>
-		<property name="canonical" type="boolean" lazy="false" column="`canonical`" not-null="false"/>
+		<property name="canonical" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`canonical`"/>
+		</property>
 	</joined-subclass>
-	<joined-subclass entity-name="ShapeStyle" abstract="false" lazy="false" extends="EObject" table="`shapestyle`">
+	<joined-subclass entity-name="ShapeStyle" abstract="false" lazy="false" extends="http://www.eclipse.org/emf/2002/Ecore/EObject" table="`shapestyle`">
+		<meta attribute="eclassName">ShapeStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`eobject_id`"/>
 		</key>
-		<property name="fontColor" type="int" lazy="false" column="`fontcolor`" not-null="false"/>
-		<property name="fontName" type="java.lang.String" lazy="false" column="`fontname`" not-null="false"/>
-		<property name="fontHeight" type="int" lazy="false" column="`fontheight`" not-null="false"/>
-		<property name="bold" type="boolean" lazy="false" column="`bold`" not-null="false"/>
-		<property name="italic" type="boolean" lazy="false" column="`italic`" not-null="false"/>
-		<property name="underline" type="boolean" lazy="false" column="`underline`" not-null="false"/>
-		<property name="strikeThrough" type="boolean" lazy="false" column="`strikethrough`" not-null="false"/>
-		<property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/>
-		<property name="fillColor" type="int" lazy="false" column="`fillcolor`" not-null="false"/>
-		<property name="lineColor" type="int" lazy="false" column="`linecolor`" not-null="false"/>
+		<property name="fontColor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`fontcolor`"/>
+		</property>
+		<property name="fontName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`fontname`"/>
+		</property>
+		<property name="fontHeight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`fontheight`"/>
+		</property>
+		<property name="bold" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`bold`"/>
+		</property>
+		<property name="italic" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`italic`"/>
+		</property>
+		<property name="underline" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`underline`"/>
+		</property>
+		<property name="strikeThrough" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`strikethrough`"/>
+		</property>
+		<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>
+		<property name="fillColor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`fillcolor`"/>
+		</property>
+		<property name="lineColor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`linecolor`"/>
+		</property>
 	</joined-subclass>
-	<joined-subclass entity-name="ConnectorStyle" abstract="false" lazy="false" extends="EObject" table="`connectorstyle`">
+	<joined-subclass entity-name="ConnectorStyle" abstract="false" lazy="false" extends="http://www.eclipse.org/emf/2002/Ecore/EObject" table="`connectorstyle`">
+		<meta attribute="eclassName">ConnectorStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`eobject_id`"/>
 		</key>
-		<property name="routing" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`routing`" not-null="false" unique="true">
+		<property name="routing" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`routing`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.Routing</param>
 			</type>
 		</property>
-		<property name="smoothness" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`smoothness`" not-null="false" unique="true">
+		<property name="smoothness" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`smoothness`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.Smoothness</param>
 			</type>
 		</property>
-		<property name="avoidObstructions" type="boolean" lazy="false" column="`avoidobstructions`" not-null="false"/>
-		<property name="closestDistance" type="boolean" lazy="false" column="`closestdistance`" not-null="false"/>
-		<property name="jumpLinkStatus" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`jumplinkstatus`" not-null="false" unique="true">
+		<property name="avoidObstructions" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`avoidobstructions`"/>
+		</property>
+		<property name="closestDistance" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`closestdistance`"/>
+		</property>
+		<property name="jumpLinkStatus" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`jumplinkstatus`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.JumpLinkStatus</param>
 			</type>
 		</property>
-		<property name="jumpLinkType" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`jumplinktype`" not-null="false" unique="true">
+		<property name="jumpLinkType" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`jumplinktype`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.JumpLinkType</param>
 			</type>
 		</property>
-		<property name="jumpLinksReverse" type="boolean" lazy="false" column="`jumplinksreverse`" not-null="false"/>
-		<property name="lineColor" type="int" lazy="false" column="`linecolor`" not-null="false"/>
+		<property name="jumpLinksReverse" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`jumplinksreverse`"/>
+		</property>
+		<property name="lineColor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`linecolor`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass entity-name="PageStyle" abstract="false" lazy="false" extends="Style" table="`pagestyle`">
+		<meta attribute="eclassName">PageStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`style_id`"/>
 		</key>
-		<property name="pageX" type="int" lazy="false" column="`pagex`" not-null="false"/>
-		<property name="pageY" type="int" lazy="false" column="`pagey`" not-null="false"/>
-		<property name="pageWidth" type="int" lazy="false" column="`pagewidth`" not-null="false"/>
-		<property name="pageHeight" type="int" lazy="false" column="`pageheight`" not-null="false"/>
+		<property name="pageX" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pagex`"/>
+		</property>
+		<property name="pageY" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pagey`"/>
+		</property>
+		<property name="pageWidth" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pagewidth`"/>
+		</property>
+		<property name="pageHeight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pageheight`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass entity-name="DrawerStyle" abstract="false" lazy="false" extends="Style" table="`drawerstyle`">
+		<meta attribute="eclassName">DrawerStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`style_id`"/>
 		</key>
-		<property name="collapsed" type="boolean" lazy="false" column="`collapsed`" not-null="false"/>
+		<property name="collapsed" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`collapsed`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass entity-name="GuideStyle" abstract="false" lazy="false" extends="Style" table="`guidestyle`">
+		<meta attribute="eclassName">GuideStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`style_id`"/>
 		</key>
@@ -549,11 +871,18 @@
 		</list>
 	</joined-subclass>
 	<class entity-name="Guide" abstract="false" lazy="false" table="`guide`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">Guide</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</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"/>
-		<property name="position" type="int" lazy="false" column="`position`" not-null="false"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="position" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`position`"/>
+		</property>
 		<list name="nodeMap" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`guide_nodemap_id`" not-null="false" unique="false"/>
@@ -563,11 +892,17 @@
 		</list>
 	</class>
 	<class entity-name="NodeEntry" abstract="false" lazy="false" table="`nodeentry`">
-		<id type="long" name="e_id" column="e_id">
+		<meta attribute="eclassName">NodeEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</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"/>
-		<property name="value" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`value`" not-null="false" unique="true">
+		<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" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`value`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.Alignment</param>
 			</type>
@@ -577,37 +912,47 @@
 		</many-to-one>
 	</class>
 	<joined-subclass entity-name="FilteringStyle" abstract="false" lazy="false" extends="Style" table="`filteringstyle`">
+		<meta attribute="eclassName">FilteringStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`style_id`"/>
 		</key>
-		<property name="filtering" lazy="false" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`filtering`" not-null="false" unique="true">
+		<property name="filtering" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`filtering`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
 				<param name="enumClass">org.eclipse.gmf.runtime.notation.Filtering</param>
 			</type>
 		</property>
-		<list name="filteringKeys" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`filteringstyle_filteringkeys_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`filteringstyle_filteringkeys_idx`"/>
-			<element type="org.eclipse.gmf.runtime.notation.Edge"/>
-		</list>
-		<list name="filteredObjects" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true">
-				<column name="`filteringstyle_filteredobjects_id`" not-null="false" unique="false"/>
-			</key>
+		<property name="filteringKeys" lazy="false" insert="true" update="true" not-null="false" unique="false" type="notation.FilterKeyList">
+			<column not-null="false" unique="false" name="`filteringkeys`"/>
+		</property>
+		<list name="filteredObjects" table="filteringstyle_filteredobjects" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key/>
 			<list-index column="`filteringstyle_filteredobjects_idx`"/>
-			<one-to-many entity-name="EObject"/>
+			<many-to-any id-type="long">
+				<column not-null="true" unique="false" name="`filteredobjects_type`"/>
+				<column not-null="true" unique="false" name="`filteredobjects_id`"/>
+			</many-to-any>
 		</list>
 	</joined-subclass>
-	<joined-subclass entity-name="DiagramStyle" abstract="false" lazy="false" extends="EObject" table="`diagramstyle`">
+	<joined-subclass entity-name="DiagramStyle" abstract="false" lazy="false" extends="http://www.eclipse.org/emf/2002/Ecore/EObject" table="`diagramstyle`">
+		<meta attribute="eclassName">DiagramStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`eobject_id`"/>
 		</key>
-		<property name="pageX" type="int" lazy="false" column="`pagex`" not-null="false"/>
-		<property name="pageY" type="int" lazy="false" column="`pagey`" not-null="false"/>
-		<property name="pageWidth" type="int" lazy="false" column="`pagewidth`" not-null="false"/>
-		<property name="pageHeight" type="int" lazy="false" column="`pageheight`" not-null="false"/>
+		<property name="pageX" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pagex`"/>
+		</property>
+		<property name="pageY" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pagey`"/>
+		</property>
+		<property name="pageWidth" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pagewidth`"/>
+		</property>
+		<property name="pageHeight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pageheight`"/>
+		</property>
 		<list name="horizontalGuides" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`guidestyle_horizontalguides_id`" not-null="false" unique="false"/>
@@ -622,19 +967,29 @@
 			<list-index column="`guidestyle_verticalguides_idx`"/>
 			<one-to-many entity-name="Guide"/>
 		</list>
-		<property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="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>
 	</joined-subclass>
 	<joined-subclass entity-name="ImageStyle" abstract="false" lazy="false" extends="Style" table="`imagestyle`">
+		<meta attribute="eclassName">ImageStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`style_id`"/>
 		</key>
-		<property name="antiAlias" type="java.lang.Boolean" lazy="false" column="`antialias`" not-null="false"/>
-		<property name="maintainAspectRatio" type="java.lang.Boolean" lazy="false" column="`maintainaspectratio`" not-null="false"/>
+		<property name="antiAlias" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
+			<column not-null="false" unique="false" name="`antialias`"/>
+		</property>
+		<property name="maintainAspectRatio" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
+			<column not-null="false" unique="false" name="`maintainaspectratio`"/>
+		</property>
 		<many-to-one name="cropBound" entity-name="Bounds" cascade="all" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`bounds_cropbound_id`"/>
 		</many-to-one>
 	</joined-subclass>
 	<joined-subclass entity-name="ImageBufferStyle" abstract="false" lazy="false" extends="ImageStyle" table="`imagebufferstyle`">
+		<meta attribute="eclassName">ImageBufferStyle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/gmf/runtime/1.0.0/notation</meta>
 		<key>
 			<column name="`imagestyle_id`"/>
 		</key>
@@ -642,4 +997,216 @@
 			<column not-null="true" unique="false" name="`image_imagebuffer_id`"/>
 		</many-to-one>
 	</joined-subclass>
+	<class entity-name="Map" abstract="false" lazy="false" table="`map`">
+		<meta attribute="eclassName">Map</meta>
+		<meta attribute="epackage">http://www.example.org/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.example.org/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.example.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.example.org/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.example.org/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.example.org/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.example.org/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.example.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/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 0a35b36d0..ba9d738c2 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.24 2006/11/20 08:18:54 mtaal Exp $
+ * $Id: AllTests.java,v 1.25 2006/11/23 06:12:26 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.test.emf.sample;
@@ -24,6 +24,7 @@ import org.eclipse.emf.teneo.test.conf.MultiCfgTestSuite;
 import org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction;
 import org.eclipse.emf.teneo.test.emf.sample.DynamicAction;
 import org.eclipse.emf.teneo.test.emf.sample.ForumAction;
+import org.eclipse.emf.teneo.test.emf.sample.GMFNotationAction;
 import org.eclipse.emf.teneo.test.emf.sample.InventoryAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction;
@@ -45,14 +46,16 @@ 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.24 $
+ * @version $Revision: 1.25 $
  */
 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(GMFNotationAction.class);
 //		suite.addTestSuite(LobjAction.class);
+		
 		suite.addTestSuite(ProductAction.class);
 
 		//	suite.addTestSuite(YahooAction.class);