New structure

710 files changed, 62961 insertions, 0 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d5dd7e4be
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,99 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.any.impl.AnyObjectImpl" entity-name="AnyObject" abstract="false" lazy="false" discriminator-value="AnyObject" table="`anyobject`">
+		<meta attribute="eclassName">AnyObject</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/any</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="anyobjectdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="globalInt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`globalint`"/>
+		</property>
+		<property name="globalString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`globalstring`"/>
+		</property>
+		<any id-type="string" meta-type="string" name="anyOne" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`anyone_id`"/>
+		</any>
+		<list name="any" table="`anyobject_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`anyobject_any_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`anyobject_any_idx`"/>
+			<one-to-many entity-name="AnyObject_any"/>
+		</list>
+		<list name="group" table="`anyobject_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`anyobject_group_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`anyobject_group_idx`"/>
+			<one-to-many entity-name="AnyObject_group"/>
+		</list>
+	</class>
+	<class entity-name="AnyObject_any" lazy="false" table="`anyobject_any`">
+		<meta attribute="featureMap">AnyObject</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="string" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class entity-name="AnyObject_group" lazy="false" table="`anyobject_group`">
+		<meta attribute="featureMap">AnyObject</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="any1" entity-name="AnyObject_any1" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="AnyObject_any1" lazy="false" table="`anyobject_any1`">
+		<meta attribute="featureMap">AnyObject</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any1_fme_any_data" type="java.lang.String"/>
+		<any id-type="string" meta-type="string" name="any1_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any1_id`"/>
+		</any>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.any.impl.GlobalObjectTypeImpl" entity-name="GlobalObjectType" abstract="false" lazy="false" discriminator-value="GlobalObjectType" table="`globalobjecttype`">
+		<meta attribute="eclassName">GlobalObjectType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/any</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="globalobjecttypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e61413cc2
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,93 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.any.impl.AnyObjectImpl" entity-name="AnyObject" abstract="false" lazy="false" table="`anyobject`">
+		<meta attribute="eclassName">AnyObject</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/any</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="globalInt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`globalint`"/>
+		</property>
+		<property name="globalString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`globalstring`"/>
+		</property>
+		<any id-type="string" meta-type="string" name="anyOne" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`anyone_id`"/>
+		</any>
+		<list name="any" table="`anyobject_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`anyobject_any_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`anyobject_any_idx`"/>
+			<one-to-many entity-name="AnyObject_any"/>
+		</list>
+		<list name="group" table="`anyobject_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`anyobject_group_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`anyobject_group_idx`"/>
+			<one-to-many entity-name="AnyObject_group"/>
+		</list>
+	</class>
+	<class entity-name="AnyObject_any" lazy="false" table="`anyobject_any`">
+		<meta attribute="featureMap">AnyObject</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="string" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class entity-name="AnyObject_group" lazy="false" table="`anyobject_group`">
+		<meta attribute="featureMap">AnyObject</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="any1" entity-name="AnyObject_any1" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="AnyObject_any1" lazy="false" table="`anyobject_any1`">
+		<meta attribute="featureMap">AnyObject</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any1_fme_any_data" type="java.lang.String"/>
+		<any id-type="string" meta-type="string" name="any1_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any1_id`"/>
+		</any>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.any.impl.GlobalObjectTypeImpl" entity-name="GlobalObjectType" abstract="false" lazy="false" table="`globalobjecttype`">
+		<meta attribute="eclassName">GlobalObjectType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/any</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e61413cc2
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,93 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.any.impl.AnyObjectImpl" entity-name="AnyObject" abstract="false" lazy="false" table="`anyobject`">
+		<meta attribute="eclassName">AnyObject</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/any</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="globalInt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`globalint`"/>
+		</property>
+		<property name="globalString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`globalstring`"/>
+		</property>
+		<any id-type="string" meta-type="string" name="anyOne" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`anyone_id`"/>
+		</any>
+		<list name="any" table="`anyobject_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`anyobject_any_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`anyobject_any_idx`"/>
+			<one-to-many entity-name="AnyObject_any"/>
+		</list>
+		<list name="group" table="`anyobject_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`anyobject_group_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`anyobject_group_idx`"/>
+			<one-to-many entity-name="AnyObject_group"/>
+		</list>
+	</class>
+	<class entity-name="AnyObject_any" lazy="false" table="`anyobject_any`">
+		<meta attribute="featureMap">AnyObject</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="string" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class entity-name="AnyObject_group" lazy="false" table="`anyobject_group`">
+		<meta attribute="featureMap">AnyObject</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="any1" entity-name="AnyObject_any1" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="AnyObject_any1" lazy="false" table="`anyobject_any1`">
+		<meta attribute="featureMap">AnyObject</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any1_fme_any_data" type="java.lang.String"/>
+		<any id-type="string" meta-type="string" name="any1_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any1_id`"/>
+		</any>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.any.impl.GlobalObjectTypeImpl" entity-name="GlobalObjectType" abstract="false" lazy="false" table="`globalobjecttype`">
+		<meta attribute="eclassName">GlobalObjectType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/any</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290696Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290696Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..da27fe427
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290696Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,57 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.BarImpl" entity-name="BarEntity" abstract="false" lazy="false" discriminator-value="BarEntity" table="`barentity`">
+		<meta attribute="eclassName">Bar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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 type="string">
+			<column name="dtype" index="barentitydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="barKeys" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="barentity_barkeys">
+				<column name="`barentity_barkeys_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`barentity_barkeys_idx`"/>
+			<one-to-many entity-name="BarKeyEntity"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.BarKeyImpl" entity-name="BarKeyEntity" abstract="false" lazy="false" discriminator-value="BarKeyEntity" table="`barkeyentity`">
+		<meta attribute="eclassName">BarKey</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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 type="string">
+			<column name="dtype" index="barkeyentitydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.FooImpl" entity-name="FooEntity" abstract="false" lazy="false" discriminator-value="FooEntity" table="`fooentity`">
+		<meta attribute="eclassName">Foo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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 type="string">
+			<column name="dtype" index="fooentitydtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="barKey" entity-name="BarKeyEntity" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="fooentity_barkey" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`barkeyentity_barkey_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290696Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290696Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..04f078575
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290696Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,48 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.BarImpl" entity-name="BarEntity" abstract="false" lazy="false" table="`barentity`">
+		<meta attribute="eclassName">Bar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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="barKeys" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="barentity_barkeys">
+				<column name="`barentity_barkeys_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`barentity_barkeys_idx`"/>
+			<one-to-many entity-name="BarKeyEntity"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.BarKeyImpl" entity-name="BarKeyEntity" abstract="false" lazy="false" table="`barkeyentity`">
+		<meta attribute="eclassName">BarKey</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.FooImpl" entity-name="FooEntity" abstract="false" lazy="false" table="`fooentity`">
+		<meta attribute="eclassName">Foo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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="barKey" entity-name="BarKeyEntity" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="fooentity_barkey" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`barkeyentity_barkey_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290696Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290696Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..04f078575
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290696Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,48 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.BarImpl" entity-name="BarEntity" abstract="false" lazy="false" table="`barentity`">
+		<meta attribute="eclassName">Bar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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="barKeys" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="barentity_barkeys">
+				<column name="`barentity_barkeys_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`barentity_barkeys_idx`"/>
+			<one-to-many entity-name="BarKeyEntity"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.BarKeyImpl" entity-name="BarKeyEntity" abstract="false" lazy="false" table="`barkeyentity`">
+		<meta attribute="eclassName">BarKey</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.FooImpl" entity-name="FooEntity" abstract="false" lazy="false" table="`fooentity`">
+		<meta attribute="eclassName">Foo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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="barKey" entity-name="BarKeyEntity" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="fooentity_barkey" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`barkeyentity_barkey_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..da27fe427
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,57 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.BarImpl" entity-name="BarEntity" abstract="false" lazy="false" discriminator-value="BarEntity" table="`barentity`">
+		<meta attribute="eclassName">Bar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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 type="string">
+			<column name="dtype" index="barentitydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="barKeys" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="barentity_barkeys">
+				<column name="`barentity_barkeys_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`barentity_barkeys_idx`"/>
+			<one-to-many entity-name="BarKeyEntity"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.BarKeyImpl" entity-name="BarKeyEntity" abstract="false" lazy="false" discriminator-value="BarKeyEntity" table="`barkeyentity`">
+		<meta attribute="eclassName">BarKey</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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 type="string">
+			<column name="dtype" index="barkeyentitydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.FooImpl" entity-name="FooEntity" abstract="false" lazy="false" discriminator-value="FooEntity" table="`fooentity`">
+		<meta attribute="eclassName">Foo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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 type="string">
+			<column name="dtype" index="fooentitydtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="barKey" entity-name="BarKeyEntity" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="fooentity_barkey" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`barkeyentity_barkey_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..04f078575
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,48 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.BarImpl" entity-name="BarEntity" abstract="false" lazy="false" table="`barentity`">
+		<meta attribute="eclassName">Bar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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="barKeys" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="barentity_barkeys">
+				<column name="`barentity_barkeys_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`barentity_barkeys_idx`"/>
+			<one-to-many entity-name="BarKeyEntity"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.BarKeyImpl" entity-name="BarKeyEntity" abstract="false" lazy="false" table="`barkeyentity`">
+		<meta attribute="eclassName">BarKey</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.FooImpl" entity-name="FooEntity" abstract="false" lazy="false" table="`fooentity`">
+		<meta attribute="eclassName">Foo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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="barKey" entity-name="BarKeyEntity" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="fooentity_barkey" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`barkeyentity_barkey_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..04f078575
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,48 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.BarImpl" entity-name="BarEntity" abstract="false" lazy="false" table="`barentity`">
+		<meta attribute="eclassName">Bar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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="barKeys" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="barentity_barkeys">
+				<column name="`barentity_barkeys_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`barentity_barkeys_idx`"/>
+			<one-to-many entity-name="BarKeyEntity"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.BarKeyImpl" entity-name="BarKeyEntity" abstract="false" lazy="false" table="`barkeyentity`">
+		<meta attribute="eclassName">BarKey</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz290969.impl.FooImpl" entity-name="FooEntity" abstract="false" lazy="false" table="`fooentity`">
+		<meta attribute="eclassName">Foo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz290969</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="barKey" entity-name="BarKeyEntity" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="fooentity_barkey" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`barkeyentity_barkey_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..61793b852
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,107 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="eavlibrary.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.CityImpl" entity-name="City" abstract="false" lazy="false" discriminator-value="City" table="`city`">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</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 type="string">
+			<column name="dtype" index="citydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`library_writer`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.PenImpl" entity-name="Pen" abstract="false" lazy="false" discriminator-value="Pen" table="`pen`">
+		<meta attribute="eclassName">Pen</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</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 type="string">
+			<column name="dtype" index="pendtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9a01984c6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,95 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="eavlibrary.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</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="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.CityImpl" entity-name="City" abstract="false" lazy="false" table="`city`">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`library_writer`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.PenImpl" entity-name="Pen" abstract="false" lazy="false" table="`pen`">
+		<meta attribute="eclassName">Pen</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9a01984c6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,95 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="eavlibrary.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</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="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.CityImpl" entity-name="City" abstract="false" lazy="false" table="`city`">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`library_writer`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.PenImpl" entity-name="Pen" abstract="false" lazy="false" table="`pen`">
+		<meta attribute="eclassName">Pen</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVExtraLazyAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVExtraLazyAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..5d314cc5e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVExtraLazyAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..61793b852
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,107 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="eavlibrary.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.CityImpl" entity-name="City" abstract="false" lazy="false" discriminator-value="City" table="`city`">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</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 type="string">
+			<column name="dtype" index="citydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`library_writer`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.PenImpl" entity-name="Pen" abstract="false" lazy="false" discriminator-value="Pen" table="`pen`">
+		<meta attribute="eclassName">Pen</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</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 type="string">
+			<column name="dtype" index="pendtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9a01984c6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,95 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="eavlibrary.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</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="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.CityImpl" entity-name="City" abstract="false" lazy="false" table="`city`">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`library_writer`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.PenImpl" entity-name="Pen" abstract="false" lazy="false" table="`pen`">
+		<meta attribute="eclassName">Pen</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9a01984c6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,95 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="eavlibrary.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</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="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.CityImpl" entity-name="City" abstract="false" lazy="false" table="`city`">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`library_writer`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.PenImpl" entity-name="Pen" abstract="false" lazy="false" table="`pen`">
+		<meta attribute="eclassName">Pen</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAllAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAllAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..747576f75
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAllAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,43 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="eavlibrary.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" discriminator-value="Book" table="`book`" proxy="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.Book">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.CityImpl" entity-name="City" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="City" proxy="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.City"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Library" proxy="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.Library"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Writer" proxy="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.Writer"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.PenImpl" entity-name="Pen" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Pen" proxy="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.Pen"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAllAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAllAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f28544817
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAllAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,40 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="eavlibrary.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" table="`book`" proxy="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.Book">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</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="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.CityImpl" entity-name="City" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="City" proxy="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.City"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Library" proxy="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.Library"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Writer" proxy="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.Writer"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.PenImpl" entity-name="Pen" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Pen" proxy="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.Pen"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAllAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAllAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f28544817
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAllAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,40 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="eavlibrary.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" table="`book`" proxy="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.Book">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</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="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/eavlibrary</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.CityImpl" entity-name="City" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="City" proxy="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.City"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Library" proxy="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.Library"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Writer" proxy="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.Writer"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl.PenImpl" entity-name="Pen" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Pen" proxy="org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.Pen"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EMapEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EMapEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..01c3ab64c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EMapEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,8 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToWriterMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EMapEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EMapEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..01c3ab64c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EMapEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,8 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToWriterMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EMapEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EMapEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..01c3ab64c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EMapEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,8 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToWriterMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazyAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazyAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7fb153918
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazyAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,47 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/extralazy</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<list name="authors" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="book_authors">
+				<column name="`book_authors_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_authors_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="subTitles" table="`book_subtitles`" lazy="extra" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`book_subtitles_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`book_subtitles_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/extralazy</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_hsqldb_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fbe802af2
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_hsqldb_e_o_hibernate.hbm.xml
@@ -0,0 +1,71 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="testSet.ContainedItem" abstract="false" lazy="false" table="`TESTSET_CONTAINEDITEM`">
+		<meta attribute="eclassName" inherit="false">ContainedItem</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="testSet.Item" abstract="false" lazy="false" table="`TESTSET_ITEM`">
+		<meta attribute="eclassName" inherit="false">Item</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<many-to-one name="itemList" entity-name="testSet.ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTSET_ITEM_ITEMLIST" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ITEM_ITEMLIST_E_ID`"/>
+		</many-to-one>
+		<property name="number" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`NUMBER`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="testSet.ItemList" abstract="false" lazy="false" table="`TESTSET_ITEMLIST`">
+		<meta attribute="eclassName" inherit="false">ItemList</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM">
+				<column name="`ITEMLIST_CONTAINEDITEM_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.ContainedItem"/>
+		</bag>
+		<bag name="item" order-by="`NAME` desc" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`ITEM_ITEMLIST_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.Item"/>
+		</bag>
+		<bag name="joinedItem" order-by="ABS(number)" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="TESTSET_ITEMLIST_JOINEDITEM">
+				<column name="`ITEMLIST_JOINEDITEM_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.Item"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_hsqldb_h_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7330c9361
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_hsqldb_h_o_hibernate.hbm.xml
@@ -0,0 +1,80 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="testSet.ContainedItem" abstract="false" lazy="false" discriminator-value="testSet.ContainedItem" table="`TESTSET_CONTAINEDITEM`">
+		<meta attribute="eclassName" inherit="false">ContainedItem</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="DTYPE" index="TESTSET_CONTAINEDITEMDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="testSet.Item" abstract="false" lazy="false" discriminator-value="testSet.Item" table="`TESTSET_ITEM`">
+		<meta attribute="eclassName" inherit="false">Item</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="DTYPE" index="TESTSET_ITEMDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<many-to-one name="itemList" entity-name="testSet.ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTSET_ITEM_ITEMLIST" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ITEM_ITEMLIST_E_ID`"/>
+		</many-to-one>
+		<property name="number" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`NUMBER`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="testSet.ItemList" abstract="false" lazy="false" discriminator-value="testSet.ItemList" table="`TESTSET_ITEMLIST`">
+		<meta attribute="eclassName" inherit="false">ItemList</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="DTYPE" index="TESTSET_ITEMLISTDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM">
+				<column name="`ITEMLIST_CONTAINEDITEM_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.ContainedItem"/>
+		</bag>
+		<bag name="item" order-by="`NAME` desc" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`ITEM_ITEMLIST_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.Item"/>
+		</bag>
+		<bag name="joinedItem" order-by="ABS(number)" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="TESTSET_ITEMLIST_JOINEDITEM">
+				<column name="`ITEMLIST_JOINEDITEM_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.Item"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..768af3149
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,68 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="testSet.ContainedItem" abstract="false" lazy="false" table="`TESTSET_CONTAINEDITEM`">
+		<meta attribute="eclassName">ContainedItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="testSet.Item" abstract="false" lazy="false" table="`TESTSET_ITEM`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<many-to-one name="itemList" entity-name="testSet.ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTSET_ITEM_ITEMLIST" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ITEM_ITEMLIST_E_ID`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="testSet.ItemList" abstract="false" lazy="false" table="`TESTSET_ITEMLIST`">
+		<meta attribute="eclassName">ItemList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM">
+				<column name="`ITEMLIST_CONTAINEDITEM_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.ContainedItem"/>
+		</bag>
+		<bag name="item" order-by="`NAME` desc" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`ITEM_ITEMLIST_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.Item"/>
+		</bag>
+		<bag name="joinedItem" order-by="`NAME` desc" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="TESTSET_ITEMLIST_JOINEDITEM">
+				<column name="`ITEMLIST_JOINEDITEM_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.Item"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbCascadeAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbCascadeAction_hsqldb_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0e3bcd396
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbCascadeAction_hsqldb_e_o_hibernate.hbm.xml
@@ -0,0 +1,39 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbcascade.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" table="`PARENT`">
+		<meta attribute="eclassName" inherit="false">Parent</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbcascade</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<bag name="children" lazy="true" cascade="persist,merge,refresh,delete,save-update,delete-orphan">
+			<key update="true" foreign-key="PARENT_CHILDREN">
+				<column name="`PARENT_CHILDREN_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Child"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbcascade.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" table="`CHILD`">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbcascade</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbCascadeAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbCascadeAction_hsqldb_h_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1689f5e5d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbCascadeAction_hsqldb_h_o_hibernate.hbm.xml
@@ -0,0 +1,45 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbcascade.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" discriminator-value="Parent" table="`PARENT`">
+		<meta attribute="eclassName" inherit="false">Parent</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbcascade</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="DTYPE" index="PARENTDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<bag name="children" lazy="true" cascade="persist,merge,refresh,delete,save-update,delete-orphan">
+			<key update="true" foreign-key="PARENT_CHILDREN">
+				<column name="`PARENT_CHILDREN_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Child"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbcascade.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" discriminator-value="Child" table="`CHILD`">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbcascade</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="DTYPE" index="CHILDDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbIdAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbIdAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f312b44cc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbIdAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,50 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdentityIDImpl" entity-name="IdentityID" abstract="false" lazy="false" discriminator-value="IdentityID" table="`identityid`">
+		<meta attribute="eclassName">IdentityID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="identity"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="identityiddtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.SimpleIDImpl" entity-name="SimpleID" abstract="false" lazy="false" discriminator-value="SimpleID" table="`simpleid`">
+		<meta attribute="eclassName">SimpleID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="autoID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`autod`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="simpleiddtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="generated" type="long">
+			<column not-null="true" unique="false" name="`generated`"/>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.TableIDImpl" entity-name="TableID" abstract="false" lazy="false" discriminator-value="TableID" table="`tableid`">
+		<meta attribute="eclassName">TableID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="hilo">
+				<param name="table">hilo_table</param>
+				<param name="column">the_hilo_column</param>
+			</generator>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="tableiddtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbIdAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbIdAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d6cb4d17c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbIdAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,41 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdentityIDImpl" entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`">
+		<meta attribute="eclassName">IdentityID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="identity"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.SimpleIDImpl" entity-name="SimpleID" abstract="false" lazy="false" table="`simpleid`">
+		<meta attribute="eclassName">SimpleID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="autoID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`autod`"/>
+			<generator class="native"/>
+		</id>
+		<version name="generated" type="long">
+			<column not-null="true" unique="false" name="`generated`"/>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.TableIDImpl" entity-name="TableID" abstract="false" lazy="false" table="`tableid`">
+		<meta attribute="eclassName">TableID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="hilo">
+				<param name="table">hilo_table</param>
+				<param name="column">the_hilo_column</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbIdAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbIdAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d6cb4d17c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbIdAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,41 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdentityIDImpl" entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`">
+		<meta attribute="eclassName">IdentityID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="identity"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.SimpleIDImpl" entity-name="SimpleID" abstract="false" lazy="false" table="`simpleid`">
+		<meta attribute="eclassName">SimpleID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="autoID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`autod`"/>
+			<generator class="native"/>
+		</id>
+		<version name="generated" type="long">
+			<column not-null="true" unique="false" name="`generated`"/>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.TableIDImpl" entity-name="TableID" abstract="false" lazy="false" table="`tableid`">
+		<meta attribute="eclassName">TableID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="hilo">
+				<param name="table">hilo_table</param>
+				<param name="column">the_hilo_column</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbMapKeysExtraLazyAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbMapKeysExtraLazyAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..389f79140
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbMapKeysExtraLazyAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,68 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<map name="writersByName" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_writersbyname">
+				<column name="`join_column_writer`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String">
+				<column not-null="false" unique="false" name="`thenameofthewriter`"/>
+			</map-key>
+			<one-to-many entity-name="Writer"/>
+		</map>
+		<map name="cityByWriter" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_citybywriter">
+				<column name="`join_column_city`" not-null="false" unique="false"/>
+			</key>
+			<map-key-many-to-many entity-name="Writer">
+				<column not-null="true" unique="false" name="`the_citywriter_id`"/>
+			</map-key-many-to-many>
+			<one-to-many entity-name="City"/>
+		</map>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.CityImpl" entity-name="City" abstract="false" lazy="false" table="`city`">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="cityWriter" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="city_citywriter" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`the_citywriter_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`thenameofthewriter`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f312b44cc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,50 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdentityIDImpl" entity-name="IdentityID" abstract="false" lazy="false" discriminator-value="IdentityID" table="`identityid`">
+		<meta attribute="eclassName">IdentityID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="identity"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="identityiddtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.SimpleIDImpl" entity-name="SimpleID" abstract="false" lazy="false" discriminator-value="SimpleID" table="`simpleid`">
+		<meta attribute="eclassName">SimpleID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="autoID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`autod`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="simpleiddtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="generated" type="long">
+			<column not-null="true" unique="false" name="`generated`"/>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.TableIDImpl" entity-name="TableID" abstract="false" lazy="false" discriminator-value="TableID" table="`tableid`">
+		<meta attribute="eclassName">TableID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="hilo">
+				<param name="table">hilo_table</param>
+				<param name="column">the_hilo_column</param>
+			</generator>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="tableiddtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d6cb4d17c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,41 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdentityIDImpl" entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`">
+		<meta attribute="eclassName">IdentityID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="identity"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.SimpleIDImpl" entity-name="SimpleID" abstract="false" lazy="false" table="`simpleid`">
+		<meta attribute="eclassName">SimpleID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="autoID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`autod`"/>
+			<generator class="native"/>
+		</id>
+		<version name="generated" type="long">
+			<column not-null="true" unique="false" name="`generated`"/>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.TableIDImpl" entity-name="TableID" abstract="false" lazy="false" table="`tableid`">
+		<meta attribute="eclassName">TableID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="hilo">
+				<param name="table">hilo_table</param>
+				<param name="column">the_hilo_column</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d6cb4d17c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,41 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdentityIDImpl" entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`">
+		<meta attribute="eclassName">IdentityID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="identity"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.SimpleIDImpl" entity-name="SimpleID" abstract="false" lazy="false" table="`simpleid`">
+		<meta attribute="eclassName">SimpleID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="autoID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`autod`"/>
+			<generator class="native"/>
+		</id>
+		<version name="generated" type="long">
+			<column not-null="true" unique="false" name="`generated`"/>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.TableIDImpl" entity-name="TableID" abstract="false" lazy="false" table="`tableid`">
+		<meta attribute="eclassName">TableID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="hilo">
+				<param name="table">hilo_table</param>
+				<param name="column">the_hilo_column</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..5c76e483c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,76 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.impl.CityImpl" entity-name="Stad" abstract="false" lazy="true" discriminator-value="Stad" table="`stad`" proxy="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.City">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hibernate</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="staddtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<bag name="streets" inverse="true" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`city_fk`" not-null="true" unique="false"/>
+			</key>
+			<one-to-many entity-name="Street" not-found="ignore"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.impl.StreetImpl" entity-name="Street" abstract="false" lazy="true" discriminator-value="Street" table="`street`" proxy="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.Street">
+		<meta attribute="eclassName">Street</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hibernate</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 type="string">
+			<column name="dtype" index="streetdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="city" entity-name="Stad" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="street_city" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`city_fk`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.impl.StateImpl" entity-name="State" abstract="false" lazy="true" discriminator-value="State" table="`state`" proxy="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.State">
+		<meta attribute="eclassName">State</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hibernate</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 type="string">
+			<column name="dtype" index="statedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<one-to-one name="stateDetail" entity-name="StateDetail" fetch="join" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" property-ref="state"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.impl.StateDetailImpl" entity-name="StateDetail" abstract="false" lazy="true" discriminator-value="StateDetail" table="`statedetail`" proxy="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.StateDetail">
+		<meta attribute="eclassName">StateDetail</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hibernate</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 type="string">
+			<column name="dtype" index="statedetaildtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="state" entity-name="State" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="false" insert="true" update="true">
+			<column not-null="false" unique="false" name="`state_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..56d759813
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,64 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.impl.CityImpl" entity-name="Stad" abstract="false" lazy="true" table="`stad`" proxy="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.City">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hibernate</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<bag name="streets" inverse="true" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`city_fk`" not-null="true" unique="false"/>
+			</key>
+			<one-to-many entity-name="Street" not-found="ignore"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.impl.StreetImpl" entity-name="Street" abstract="false" lazy="true" table="`street`" proxy="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.Street">
+		<meta attribute="eclassName">Street</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hibernate</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="city" entity-name="Stad" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="street_city" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`city_fk`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.impl.StateImpl" entity-name="State" abstract="false" lazy="true" table="`state`" proxy="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.State">
+		<meta attribute="eclassName">State</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hibernate</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>
+		<one-to-one name="stateDetail" entity-name="StateDetail" fetch="join" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" property-ref="state"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.impl.StateDetailImpl" entity-name="StateDetail" abstract="false" lazy="true" table="`statedetail`" proxy="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.StateDetail">
+		<meta attribute="eclassName">StateDetail</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hibernate</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="state" entity-name="State" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="false" insert="true" update="true">
+			<column not-null="false" unique="false" name="`state_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..56d759813
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,64 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.impl.CityImpl" entity-name="Stad" abstract="false" lazy="true" table="`stad`" proxy="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.City">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hibernate</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<bag name="streets" inverse="true" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`city_fk`" not-null="true" unique="false"/>
+			</key>
+			<one-to-many entity-name="Street" not-found="ignore"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.impl.StreetImpl" entity-name="Street" abstract="false" lazy="true" table="`street`" proxy="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.Street">
+		<meta attribute="eclassName">Street</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hibernate</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="city" entity-name="Stad" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="street_city" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`city_fk`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.impl.StateImpl" entity-name="State" abstract="false" lazy="true" table="`state`" proxy="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.State">
+		<meta attribute="eclassName">State</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hibernate</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>
+		<one-to-one name="stateDetail" entity-name="StateDetail" fetch="join" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" property-ref="state"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.impl.StateDetailImpl" entity-name="StateDetail" abstract="false" lazy="true" table="`statedetail`" proxy="org.eclipse.emf.teneo.samples.emf.annotations.hibernate.StateDetail">
+		<meta attribute="eclassName">StateDetail</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hibernate</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="state" entity-name="State" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="false" insert="true" update="true">
+			<column not-null="false" unique="false" name="`state_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/IdTypeTestOneAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/IdTypeTestOneAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e85eb5305
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/IdTypeTestOneAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,26 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid</meta>
+		<composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-id>
+		<discriminator type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/IdTypeTestOneAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/IdTypeTestOneAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..22828e5f4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/IdTypeTestOneAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,23 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid</meta>
+		<composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-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="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/IdTypeTestOneAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/IdTypeTestOneAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..22828e5f4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/IdTypeTestOneAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,23 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid</meta>
+		<composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-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="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..09169953d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns</meta>
+		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-id>
+		<discriminator type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="myversion" column="myversion" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<bag name="friends" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`person_person`">
+			<key update="true">
+				<column name="`person_friends_firstname`" not-null="true" unique="false"/>
+				<column name="`person_friends_lastname`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Person" unique="false" foreign-key="person_friends">
+				<column name="`person_oppositefriends_firstname`" not-null="true" unique="false"/>
+				<column name="`person_oppositefriends_lastname`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="oppositeFriends" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`person_person`">
+			<key update="true">
+				<column name="`person_oppositefriends_firstname`" not-null="true" unique="false"/>
+				<column name="`person_oppositefriends_lastname`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Person" unique="false" foreign-key="person_oppositefriends">
+				<column name="`person_friends_firstname`" not-null="true" unique="false"/>
+				<column name="`person_friends_lastname`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" extends="Person" discriminator-value="Parent">
+		<meta attribute="eclassName">Parent</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns</meta>
+		<list name="children" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_children">
+				<column name="`myparentfirstname`" not-null="false" unique="false"/>
+				<column name="`myparentlastname`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_children_idx`"/>
+			<one-to-many entity-name="Child"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Person" discriminator-value="Child">
+		<meta attribute="eclassName">Child</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns</meta>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.HouseImpl" entity-name="House" abstract="false" lazy="false" discriminator-value="House" table="`house`">
+		<meta attribute="eclassName">House</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns</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 type="string">
+			<column name="dtype" index="housedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="myversion" column="myversion" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<many-to-one name="owner" entity-name="Parent" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="house_owner" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`parent_owner_firstname`"/>
+			<column not-null="false" unique="false" name="`parent_owner_lastname`"/>
+		</many-to-one>
+		<list name="visitors" table="`house_person`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`rightcolumn`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`house_visitors_idx`"/>
+			<many-to-many entity-name="Person" unique="true" foreign-key="house_visitors">
+				<column name="`person_firstname`" not-null="true" unique="false"/>
+				<column name="`person_lastname`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fe0b0c182
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,89 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns</meta>
+		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-id>
+		<version name="myversion" column="myversion" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<bag name="friends" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`person_person`">
+			<key update="true">
+				<column name="`person_friends_firstname`" not-null="true" unique="false"/>
+				<column name="`person_friends_lastname`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Person" unique="false" foreign-key="person_friends">
+				<column name="`person_oppositefriends_firstname`" not-null="true" unique="false"/>
+				<column name="`person_oppositefriends_lastname`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="oppositeFriends" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`person_person`">
+			<key update="true">
+				<column name="`person_oppositefriends_firstname`" not-null="true" unique="false"/>
+				<column name="`person_oppositefriends_lastname`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Person" unique="false" foreign-key="person_oppositefriends">
+				<column name="`person_friends_firstname`" not-null="true" unique="false"/>
+				<column name="`person_friends_lastname`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" extends="Person" table="`parent`">
+		<meta attribute="eclassName">Parent</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns</meta>
+		<key>
+			<column name="`person_firstname`"/>
+			<column name="`person_lastname`"/>
+		</key>
+		<list name="children" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_children">
+				<column name="`myparentfirstname`" not-null="false" unique="false"/>
+				<column name="`myparentlastname`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_children_idx`"/>
+			<one-to-many entity-name="Child"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Person" table="`child`">
+		<meta attribute="eclassName">Child</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns</meta>
+		<key>
+			<column name="`person_firstname`"/>
+			<column name="`person_lastname`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.HouseImpl" entity-name="House" abstract="false" lazy="false" table="`house`">
+		<meta attribute="eclassName">House</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns</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="myversion" column="myversion" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<many-to-one name="owner" entity-name="Parent" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="house_owner" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`parent_owner_firstname`"/>
+			<column not-null="false" unique="false" name="`parent_owner_lastname`"/>
+		</many-to-one>
+		<list name="visitors" table="`house_person`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`rightcolumn`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`house_visitors_idx`"/>
+			<many-to-many entity-name="Person" unique="true" foreign-key="house_visitors">
+				<column name="`person_firstname`" not-null="true" unique="false"/>
+				<column name="`person_lastname`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fe0b0c182
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,89 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns</meta>
+		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-id>
+		<version name="myversion" column="myversion" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<bag name="friends" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`person_person`">
+			<key update="true">
+				<column name="`person_friends_firstname`" not-null="true" unique="false"/>
+				<column name="`person_friends_lastname`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Person" unique="false" foreign-key="person_friends">
+				<column name="`person_oppositefriends_firstname`" not-null="true" unique="false"/>
+				<column name="`person_oppositefriends_lastname`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="oppositeFriends" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`person_person`">
+			<key update="true">
+				<column name="`person_oppositefriends_firstname`" not-null="true" unique="false"/>
+				<column name="`person_oppositefriends_lastname`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Person" unique="false" foreign-key="person_oppositefriends">
+				<column name="`person_friends_firstname`" not-null="true" unique="false"/>
+				<column name="`person_friends_lastname`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" extends="Person" table="`parent`">
+		<meta attribute="eclassName">Parent</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns</meta>
+		<key>
+			<column name="`person_firstname`"/>
+			<column name="`person_lastname`"/>
+		</key>
+		<list name="children" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_children">
+				<column name="`myparentfirstname`" not-null="false" unique="false"/>
+				<column name="`myparentlastname`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_children_idx`"/>
+			<one-to-many entity-name="Child"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Person" table="`child`">
+		<meta attribute="eclassName">Child</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns</meta>
+		<key>
+			<column name="`person_firstname`"/>
+			<column name="`person_lastname`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.HouseImpl" entity-name="House" abstract="false" lazy="false" table="`house`">
+		<meta attribute="eclassName">House</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns</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="myversion" column="myversion" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<many-to-one name="owner" entity-name="Parent" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="house_owner" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`parent_owner_firstname`"/>
+			<column not-null="false" unique="false" name="`parent_owner_lastname`"/>
+		</many-to-one>
+		<list name="visitors" table="`house_person`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`rightcolumn`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`house_visitors_idx`"/>
+			<many-to-many entity-name="Person" unique="true" foreign-key="house_visitors">
+				<column name="`person_firstname`" not-null="true" unique="false"/>
+				<column name="`person_lastname`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/MapKeyEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/MapKeyEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..01c3ab64c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/MapKeyEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,8 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToWriterMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/MapKeyEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/MapKeyEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..01c3ab64c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/MapKeyEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,8 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToWriterMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/MapKeyEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/MapKeyEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..01c3ab64c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/MapKeyEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,8 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToWriterMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/SetAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/SetAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7cc3e6809
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/SetAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,68 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="testSet.ContainedItem" abstract="false" lazy="false" table="`TESTSET_CONTAINEDITEM`">
+		<meta attribute="eclassName">ContainedItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="testSet.Item" abstract="false" lazy="false" table="`TESTSET_ITEM`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<many-to-one name="itemList" entity-name="testSet.ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTSET_ITEM_ITEMLIST" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ITEM_ITEMLIST_E_ID`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="testSet.ItemList" abstract="false" lazy="false" table="`TESTSET_ITEMLIST`">
+		<meta attribute="eclassName">ItemList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM">
+				<column name="`ITEMLIST_CONTAINEDITEM_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.ContainedItem"/>
+		</bag>
+		<bag name="item" order-by="`NAME` desc" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`ITEM_ITEMLIST_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.Item"/>
+		</bag>
+		<bag name="joinedItem" order-by="`NAME` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="TESTSET_ITEMLIST_JOINEDITEM">
+				<column name="`ITEMLIST_JOINEDITEM_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.Item"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a554fabf4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,105 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="nameType" class="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType"/>
+	<typedef name="usertype.PhoneNumber" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param>
+		<param name="edatatype">PhoneNumber</param>
+	</typedef>
+	<typedef name="intArrayType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param>
+		<param name="edatatype">IntArray</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" polymorphism="explicit" optimistic-lock="version" dynamic-insert="true" dynamic-update="true" select-before-update="true" persister="org.hibernate.persister.entity.SingleTableEntityPersister" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.elver.org/samples/emf/hibernate/usertype</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 type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="nameType">
+			<column not-null="false" unique="false" name="`first_name`"/>
+			<column not-null="false" unique="false" name="`last_name`"/>
+		</property>
+		<property name="numbers" lazy="false" insert="true" update="true" not-null="true" unique="false" type="intArrayType">
+			<column not-null="true" unique="false" name="`numbers`"/>
+		</property>
+		<list name="phoneNumbers" table="`person_phonenumbers`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`person_phonenumbers_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`person_phonenumbers_idx`"/>
+			<element type="usertype.PhoneNumber"/>
+		</list>
+		<property name="emergencyContact" lazy="false" insert="true" update="true" not-null="false" unique="false" type="usertype.PhoneNumber">
+			<column not-null="false" unique="false" name="`emergencycontact`"/>
+		</property>
+		<bag name="addresses" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`address_person_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Address"/>
+		</bag>
+		<property name="birthPlace" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`birthplace`"/>
+		</property>
+		<property name="double" lazy="false" insert="true" update="true" not-null="true" unique="false">
+			<column not-null="true" unique="false" name="`double`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param>
+				<param name="edatatype">myDoubleType</param>
+			</type>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.elver.org/samples/emf/hibernate/usertype</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 type="string">
+			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="addressInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`addressinfo`"/>
+		</property>
+		<many-to-one name="person" entity-name="Person" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="address_person" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_person_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.CityImpl" entity-name="City" abstract="false" lazy="false" discriminator-value="City" table="`city`">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.elver.org/samples/emf/hibernate/usertype</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="assigned"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="citydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.hibernate.usertype.CitySize</param>
+				<param name="eclassifier">CitySize</param>
+				<param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param>
+			</type>
+		</property>
+	</class>
+	<query name="getPersonByBirthPlace2"><![CDATA[select p from Person p where p.birthPlace=?]]></query>
+	<query name="getPersonByBirthPlace"><![CDATA[select p from Person p where p.birthPlace=?]]></query>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..bc9798973
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,96 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="nameType" class="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType"/>
+	<typedef name="usertype.PhoneNumber" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param>
+		<param name="edatatype">PhoneNumber</param>
+	</typedef>
+	<typedef name="intArrayType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param>
+		<param name="edatatype">IntArray</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" polymorphism="explicit" optimistic-lock="version" dynamic-insert="true" dynamic-update="true" select-before-update="true" persister="org.hibernate.persister.entity.SingleTableEntityPersister" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.elver.org/samples/emf/hibernate/usertype</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="nameType">
+			<column not-null="false" unique="false" name="`first_name`"/>
+			<column not-null="false" unique="false" name="`last_name`"/>
+		</property>
+		<property name="numbers" lazy="false" insert="true" update="true" not-null="true" unique="false" type="intArrayType">
+			<column not-null="true" unique="false" name="`numbers`"/>
+		</property>
+		<list name="phoneNumbers" table="`person_phonenumbers`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`person_phonenumbers_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`person_phonenumbers_idx`"/>
+			<element type="usertype.PhoneNumber"/>
+		</list>
+		<property name="emergencyContact" lazy="false" insert="true" update="true" not-null="false" unique="false" type="usertype.PhoneNumber">
+			<column not-null="false" unique="false" name="`emergencycontact`"/>
+		</property>
+		<bag name="addresses" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`address_person_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Address"/>
+		</bag>
+		<property name="birthPlace" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`birthplace`"/>
+		</property>
+		<property name="double" lazy="false" insert="true" update="true" not-null="true" unique="false">
+			<column not-null="true" unique="false" name="`double`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param>
+				<param name="edatatype">myDoubleType</param>
+			</type>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.elver.org/samples/emf/hibernate/usertype</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="addressInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`addressinfo`"/>
+		</property>
+		<many-to-one name="person" entity-name="Person" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="address_person" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_person_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.CityImpl" entity-name="City" abstract="false" lazy="false" table="`city`">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.elver.org/samples/emf/hibernate/usertype</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="assigned"/>
+		</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="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.hibernate.usertype.CitySize</param>
+				<param name="eclassifier">CitySize</param>
+				<param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param>
+			</type>
+		</property>
+	</class>
+	<query name="getPersonByBirthPlace2"><![CDATA[select p from Person p where p.birthPlace=?]]></query>
+	<query name="getPersonByBirthPlace"><![CDATA[select p from Person p where p.birthPlace=?]]></query>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..bc9798973
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,96 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="nameType" class="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType"/>
+	<typedef name="usertype.PhoneNumber" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param>
+		<param name="edatatype">PhoneNumber</param>
+	</typedef>
+	<typedef name="intArrayType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param>
+		<param name="edatatype">IntArray</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" polymorphism="explicit" optimistic-lock="version" dynamic-insert="true" dynamic-update="true" select-before-update="true" persister="org.hibernate.persister.entity.SingleTableEntityPersister" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.elver.org/samples/emf/hibernate/usertype</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="nameType">
+			<column not-null="false" unique="false" name="`first_name`"/>
+			<column not-null="false" unique="false" name="`last_name`"/>
+		</property>
+		<property name="numbers" lazy="false" insert="true" update="true" not-null="true" unique="false" type="intArrayType">
+			<column not-null="true" unique="false" name="`numbers`"/>
+		</property>
+		<list name="phoneNumbers" table="`person_phonenumbers`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`person_phonenumbers_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`person_phonenumbers_idx`"/>
+			<element type="usertype.PhoneNumber"/>
+		</list>
+		<property name="emergencyContact" lazy="false" insert="true" update="true" not-null="false" unique="false" type="usertype.PhoneNumber">
+			<column not-null="false" unique="false" name="`emergencycontact`"/>
+		</property>
+		<bag name="addresses" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`address_person_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Address"/>
+		</bag>
+		<property name="birthPlace" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`birthplace`"/>
+		</property>
+		<property name="double" lazy="false" insert="true" update="true" not-null="true" unique="false">
+			<column not-null="true" unique="false" name="`double`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param>
+				<param name="edatatype">myDoubleType</param>
+			</type>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.elver.org/samples/emf/hibernate/usertype</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="addressInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`addressinfo`"/>
+		</property>
+		<many-to-one name="person" entity-name="Person" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="address_person" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_person_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.CityImpl" entity-name="City" abstract="false" lazy="false" table="`city`">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.elver.org/samples/emf/hibernate/usertype</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="assigned"/>
+		</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="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.hibernate.usertype.CitySize</param>
+				<param name="eclassifier">CitySize</param>
+				<param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param>
+			</type>
+		</property>
+	</class>
+	<query name="getPersonByBirthPlace2"><![CDATA[select p from Person p where p.birthPlace=?]]></query>
+	<query name="getPersonByBirthPlace"><![CDATA[select p from Person p where p.birthPlace=?]]></query>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachFeatureMapTest$1_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachFeatureMapTest$1_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1b7b1b1b8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachFeatureMapTest$1_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,76 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl.ContactsImpl" entity-name="Contacts" abstract="false" lazy="false" discriminator-value="Contacts" table="`contacts`">
+		<meta attribute="eclassName">Contacts</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/detach/detachfeaturemap</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 type="string">
+			<column name="dtype" index="contactsdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="persons" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="contacts_persons">
+				<column name="`contacts_persons_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contacts_persons_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/detach/detachfeaturemap</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 type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="phones" table="`person_phones`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`person_phones_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_phones_idx`"/>
+			<one-to-many entity-name="Person_phones"/>
+		</list>
+	</class>
+	<class entity-name="Person_phones" lazy="false" table="`person_phones`">
+		<meta attribute="featureMap">Person</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="office" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`phones_office`"/>
+		</property>
+		<property name="mobile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`phones_mobile`"/>
+		</property>
+		<property name="fax" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`phones_fax`"/>
+		</property>
+		<property name="home" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`phones_home`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl.SpecialPersonImpl" entity-name="SpecialPerson" abstract="false" lazy="false" extends="Person" discriminator-value="SpecialPerson">
+		<meta attribute="eclassName">SpecialPerson</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/detach/detachfeaturemap</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachFeatureMapTest$1_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachFeatureMapTest$1_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f37f9b79e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachFeatureMapTest$1_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,73 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl.ContactsImpl" entity-name="Contacts" abstract="false" lazy="false" table="`contacts`">
+		<meta attribute="eclassName">Contacts</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/detach/detachfeaturemap</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="persons" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="contacts_persons">
+				<column name="`contacts_persons_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contacts_persons_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/detach/detachfeaturemap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="phones" table="`person_phones`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`person_phones_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_phones_idx`"/>
+			<one-to-many entity-name="Person_phones"/>
+		</list>
+	</class>
+	<class entity-name="Person_phones" lazy="false" table="`person_phones`">
+		<meta attribute="featureMap">Person</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="office" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`phones_office`"/>
+		</property>
+		<property name="mobile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`phones_mobile`"/>
+		</property>
+		<property name="fax" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`phones_fax`"/>
+		</property>
+		<property name="home" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`phones_home`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl.SpecialPersonImpl" entity-name="SpecialPerson" abstract="false" lazy="false" extends="Person" table="`specialperson`">
+		<meta attribute="eclassName">SpecialPerson</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/detach/detachfeaturemap</meta>
+		<key>
+			<column name="`person_e_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachFeatureMapTest$1_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachFeatureMapTest$1_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f37f9b79e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachFeatureMapTest$1_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,73 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl.ContactsImpl" entity-name="Contacts" abstract="false" lazy="false" table="`contacts`">
+		<meta attribute="eclassName">Contacts</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/detach/detachfeaturemap</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="persons" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="contacts_persons">
+				<column name="`contacts_persons_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contacts_persons_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/detach/detachfeaturemap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="phones" table="`person_phones`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`person_phones_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_phones_idx`"/>
+			<one-to-many entity-name="Person_phones"/>
+		</list>
+	</class>
+	<class entity-name="Person_phones" lazy="false" table="`person_phones`">
+		<meta attribute="featureMap">Person</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="office" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`phones_office`"/>
+		</property>
+		<property name="mobile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`phones_mobile`"/>
+		</property>
+		<property name="fax" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`phones_fax`"/>
+		</property>
+		<property name="home" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`phones_home`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl.SpecialPersonImpl" entity-name="SpecialPerson" abstract="false" lazy="false" extends="Person" table="`specialperson`">
+		<meta attribute="eclassName">SpecialPerson</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/detach/detachfeaturemap</meta>
+		<key>
+			<column name="`person_e_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachTest$1_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachTest$1_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b37071b51
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachTest$1_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,69 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl.TestAImpl" entity-name="TestA" abstract="false" lazy="false" discriminator-value="TestA" table="`testa`">
+		<meta attribute="eclassName">TestA</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/detach/detachtest</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 type="string">
+			<column name="dtype" index="testadtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+		<many-to-one name="testB" entity-name="TestB" lazy="false" cascade="all" foreign-key="testa_testb" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`testb_testb_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl.TestBImpl" entity-name="TestB" abstract="false" lazy="false" discriminator-value="TestB" table="`testb`">
+		<meta attribute="eclassName">TestB</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/detach/detachtest</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 type="string">
+			<column name="dtype" index="testbdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl.TestCImpl" entity-name="TestC" abstract="false" lazy="false" discriminator-value="TestC" table="`testc`">
+		<meta attribute="eclassName">TestC</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/detach/detachtest</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 type="string">
+			<column name="dtype" index="testcdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+		<property name="myDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="true" unique="false" name="`mydate`"/>
+		</property>
+		<list name="testB" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="testc_testb">
+				<column name="`testc_testb_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`testc_testb_idx`"/>
+			<one-to-many entity-name="TestB"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachTest$1_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachTest$1_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8df7d36ed
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachTest$1_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,60 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl.TestAImpl" entity-name="TestA" abstract="false" lazy="false" table="`testa`">
+		<meta attribute="eclassName">TestA</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/detach/detachtest</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="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+		<many-to-one name="testB" entity-name="TestB" lazy="false" cascade="all" foreign-key="testa_testb" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`testb_testb_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl.TestBImpl" entity-name="TestB" abstract="false" lazy="false" table="`testb`">
+		<meta attribute="eclassName">TestB</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/detach/detachtest</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="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl.TestCImpl" entity-name="TestC" abstract="false" lazy="false" table="`testc`">
+		<meta attribute="eclassName">TestC</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/detach/detachtest</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="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+		<property name="myDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="true" unique="false" name="`mydate`"/>
+		</property>
+		<list name="testB" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="testc_testb">
+				<column name="`testc_testb_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`testc_testb_idx`"/>
+			<one-to-many entity-name="TestB"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachTest$1_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachTest$1_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8df7d36ed
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.detach/DetachTest$1_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,60 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl.TestAImpl" entity-name="TestA" abstract="false" lazy="false" table="`testa`">
+		<meta attribute="eclassName">TestA</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/detach/detachtest</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="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+		<many-to-one name="testB" entity-name="TestB" lazy="false" cascade="all" foreign-key="testa_testb" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`testb_testb_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl.TestBImpl" entity-name="TestB" abstract="false" lazy="false" table="`testb`">
+		<meta attribute="eclassName">TestB</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/detach/detachtest</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="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl.TestCImpl" entity-name="TestC" abstract="false" lazy="false" table="`testc`">
+		<meta attribute="eclassName">TestC</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/detach/detachtest</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="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+		<property name="myDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="true" unique="false" name="`mydate`"/>
+		</property>
+		<list name="testB" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="testc_testb">
+				<column name="`testc_testb_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`testc_testb_idx`"/>
+			<one-to-many entity-name="TestB"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0060516f4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,127 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="featuremap.ProductClassificationObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+		<param name="edatatype">ProductClassificationObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.PriceByQuantityTypeImpl" entity-name="PriceByQuantityType" abstract="false" lazy="false" table="`pricebyquantitytype`">
+		<meta attribute="eclassName">PriceByQuantityType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`quantity`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" table="`producttype`">
+		<meta attribute="eclassName">ProductType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="group" table="`producttype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`producttype_group_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_group_idx`"/>
+			<one-to-many entity-name="ProductType_group"/>
+		</list>
+		<property name="productClassification" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`productclassification`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.elist.featuremap.ProductClassification</param>
+				<param name="eclassifier">ProductClassification</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+			</type>
+		</property>
+		<list name="group1" table="`producttype_group1`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`producttype_group1_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_group1_idx`"/>
+			<one-to-many entity-name="ProductType_group1"/>
+		</list>
+	</class>
+	<class entity-name="ProductType_group" lazy="false" table="`producttype_group`">
+		<meta attribute="featureMap">ProductType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`group_description`"/>
+		</property>
+		<many-to-one name="translatedDescription" entity-name="TranslatedDescriptionType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_translateddescription" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_translateddescriptiontype_translateddescription_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="ProductType_group1" lazy="false" table="`producttype_group1`">
+		<meta attribute="featureMap">ProductType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="priceByQuantity" entity-name="PriceByQuantityType" lazy="false" cascade="all" foreign-key="producttype_pricebyquantity" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group1_pricebyquantitytype_pricebyquantity_e_id`"/>
+		</many-to-one>
+		<many-to-one name="priceFromSupplier" entity-name="SupplierPriceType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_pricefromsupplier" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group1_supplierpricetype_pricefromsupplier_e_id`"/>
+		</many-to-one>
+		<property name="simplePrice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`group1_simpleprice`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.SupplierPriceTypeImpl" entity-name="SupplierPriceType" abstract="false" lazy="false" table="`supplierpricetype`">
+		<meta attribute="eclassName">SupplierPriceType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.TranslatedDescriptionTypeImpl" entity-name="TranslatedDescriptionType" abstract="false" lazy="false" table="`translateddescriptiontype`">
+		<meta attribute="eclassName">TranslatedDescriptionType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="language" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`language`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapComponentAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapComponentAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ea8557f3b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapComponentAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,129 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="featuremap.ProductClassificationObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+		<param name="edatatype">ProductClassificationObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.PriceByQuantityTypeImpl" entity-name="PriceByQuantityType" abstract="false" lazy="false" discriminator-value="PriceByQuantityType" table="`pricebyquantitytype`">
+		<meta attribute="eclassName">PriceByQuantityType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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 type="string">
+			<column name="dtype" index="pricebyquantitytypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`quantity`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`">
+		<meta attribute="eclassName">ProductType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="producttypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="group" table="`producttype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`producttype_group_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_group_idx`"/>
+			<composite-element class="org.eclipse.emf.teneo.hibernate.mapping.elist.HibernateFeatureMapEntry">
+				<meta attribute="featureMap">ProductType</meta>
+				<tuplizer entity-mode="pojo" class="org.eclipse.emf.teneo.hibernate.mapping.elist.FeatureMapEntryComponentTuplizer"/>
+				<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.teneo.hibernate.mapping.elist.FeatureMapEntryComponentTuplizer"/>
+				<property name="fme_feature" type="java.lang.String"/>
+				<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="`group_description`"/>
+				</property>
+				<many-to-one name="translatedDescription" entity-name="TranslatedDescriptionType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_translateddescription" insert="true" update="true" not-null="false">
+					<column not-null="false" unique="false" name="`group_translateddescriptiontype_translateddescription_e_id`"/>
+				</many-to-one>
+			</composite-element>
+		</list>
+		<property name="productClassification" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`productclassification`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.elist.featuremap.ProductClassification</param>
+				<param name="eclassifier">ProductClassification</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+			</type>
+		</property>
+		<list name="group1" table="`producttype_group1`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`producttype_group1_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_group1_idx`"/>
+			<composite-element class="org.eclipse.emf.teneo.hibernate.mapping.elist.HibernateFeatureMapEntry">
+				<meta attribute="featureMap">ProductType</meta>
+				<tuplizer entity-mode="pojo" class="org.eclipse.emf.teneo.hibernate.mapping.elist.FeatureMapEntryComponentTuplizer"/>
+				<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.teneo.hibernate.mapping.elist.FeatureMapEntryComponentTuplizer"/>
+				<property name="fme_feature" type="java.lang.String"/>
+				<many-to-one name="priceByQuantity" entity-name="PriceByQuantityType" lazy="false" cascade="all" foreign-key="producttype_pricebyquantity" insert="true" update="true" not-null="false">
+					<column not-null="false" unique="false" name="`group1_pricebyquantitytype_pricebyquantity_e_id`"/>
+				</many-to-one>
+				<many-to-one name="priceFromSupplier" entity-name="SupplierPriceType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_pricefromsupplier" insert="true" update="true" not-null="false">
+					<column not-null="false" unique="false" name="`group1_supplierpricetype_pricefromsupplier_e_id`"/>
+				</many-to-one>
+				<property name="simplePrice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+					<column not-null="false" unique="false" name="`group1_simpleprice`"/>
+				</property>
+			</composite-element>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.SupplierPriceTypeImpl" entity-name="SupplierPriceType" abstract="false" lazy="false" discriminator-value="SupplierPriceType" table="`supplierpricetype`">
+		<meta attribute="eclassName">SupplierPriceType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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 type="string">
+			<column name="dtype" index="supplierpricetypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.TranslatedDescriptionTypeImpl" entity-name="TranslatedDescriptionType" abstract="false" lazy="false" discriminator-value="TranslatedDescriptionType" table="`translateddescriptiontype`">
+		<meta attribute="eclassName">TranslatedDescriptionType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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 type="string">
+			<column name="dtype" index="translateddescriptiontypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="language" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`language`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapComponentAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapComponentAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..eb1b44083
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapComponentAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,117 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="featuremap.ProductClassificationObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+		<param name="edatatype">ProductClassificationObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.PriceByQuantityTypeImpl" entity-name="PriceByQuantityType" abstract="false" lazy="false" table="`pricebyquantitytype`">
+		<meta attribute="eclassName">PriceByQuantityType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`quantity`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" table="`producttype`">
+		<meta attribute="eclassName">ProductType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="group" table="`producttype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`producttype_group_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_group_idx`"/>
+			<composite-element class="org.eclipse.emf.teneo.hibernate.mapping.elist.HibernateFeatureMapEntry">
+				<meta attribute="featureMap">ProductType</meta>
+				<tuplizer entity-mode="pojo" class="org.eclipse.emf.teneo.hibernate.mapping.elist.FeatureMapEntryComponentTuplizer"/>
+				<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.teneo.hibernate.mapping.elist.FeatureMapEntryComponentTuplizer"/>
+				<property name="fme_feature" type="java.lang.String"/>
+				<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="`group_description`"/>
+				</property>
+				<many-to-one name="translatedDescription" entity-name="TranslatedDescriptionType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_translateddescription" insert="true" update="true" not-null="false">
+					<column not-null="false" unique="false" name="`group_translateddescriptiontype_translateddescription_e_id`"/>
+				</many-to-one>
+			</composite-element>
+		</list>
+		<property name="productClassification" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`productclassification`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.elist.featuremap.ProductClassification</param>
+				<param name="eclassifier">ProductClassification</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+			</type>
+		</property>
+		<list name="group1" table="`producttype_group1`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`producttype_group1_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_group1_idx`"/>
+			<composite-element class="org.eclipse.emf.teneo.hibernate.mapping.elist.HibernateFeatureMapEntry">
+				<meta attribute="featureMap">ProductType</meta>
+				<tuplizer entity-mode="pojo" class="org.eclipse.emf.teneo.hibernate.mapping.elist.FeatureMapEntryComponentTuplizer"/>
+				<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.teneo.hibernate.mapping.elist.FeatureMapEntryComponentTuplizer"/>
+				<property name="fme_feature" type="java.lang.String"/>
+				<many-to-one name="priceByQuantity" entity-name="PriceByQuantityType" lazy="false" cascade="all" foreign-key="producttype_pricebyquantity" insert="true" update="true" not-null="false">
+					<column not-null="false" unique="false" name="`group1_pricebyquantitytype_pricebyquantity_e_id`"/>
+				</many-to-one>
+				<many-to-one name="priceFromSupplier" entity-name="SupplierPriceType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_pricefromsupplier" insert="true" update="true" not-null="false">
+					<column not-null="false" unique="false" name="`group1_supplierpricetype_pricefromsupplier_e_id`"/>
+				</many-to-one>
+				<property name="simplePrice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+					<column not-null="false" unique="false" name="`group1_simpleprice`"/>
+				</property>
+			</composite-element>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.SupplierPriceTypeImpl" entity-name="SupplierPriceType" abstract="false" lazy="false" table="`supplierpricetype`">
+		<meta attribute="eclassName">SupplierPriceType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.TranslatedDescriptionTypeImpl" entity-name="TranslatedDescriptionType" abstract="false" lazy="false" table="`translateddescriptiontype`">
+		<meta attribute="eclassName">TranslatedDescriptionType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="language" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`language`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapComponentAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapComponentAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..eb1b44083
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapComponentAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,117 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="featuremap.ProductClassificationObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+		<param name="edatatype">ProductClassificationObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.PriceByQuantityTypeImpl" entity-name="PriceByQuantityType" abstract="false" lazy="false" table="`pricebyquantitytype`">
+		<meta attribute="eclassName">PriceByQuantityType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`quantity`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" table="`producttype`">
+		<meta attribute="eclassName">ProductType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="group" table="`producttype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`producttype_group_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_group_idx`"/>
+			<composite-element class="org.eclipse.emf.teneo.hibernate.mapping.elist.HibernateFeatureMapEntry">
+				<meta attribute="featureMap">ProductType</meta>
+				<tuplizer entity-mode="pojo" class="org.eclipse.emf.teneo.hibernate.mapping.elist.FeatureMapEntryComponentTuplizer"/>
+				<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.teneo.hibernate.mapping.elist.FeatureMapEntryComponentTuplizer"/>
+				<property name="fme_feature" type="java.lang.String"/>
+				<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="`group_description`"/>
+				</property>
+				<many-to-one name="translatedDescription" entity-name="TranslatedDescriptionType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_translateddescription" insert="true" update="true" not-null="false">
+					<column not-null="false" unique="false" name="`group_translateddescriptiontype_translateddescription_e_id`"/>
+				</many-to-one>
+			</composite-element>
+		</list>
+		<property name="productClassification" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`productclassification`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.elist.featuremap.ProductClassification</param>
+				<param name="eclassifier">ProductClassification</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+			</type>
+		</property>
+		<list name="group1" table="`producttype_group1`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`producttype_group1_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_group1_idx`"/>
+			<composite-element class="org.eclipse.emf.teneo.hibernate.mapping.elist.HibernateFeatureMapEntry">
+				<meta attribute="featureMap">ProductType</meta>
+				<tuplizer entity-mode="pojo" class="org.eclipse.emf.teneo.hibernate.mapping.elist.FeatureMapEntryComponentTuplizer"/>
+				<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.teneo.hibernate.mapping.elist.FeatureMapEntryComponentTuplizer"/>
+				<property name="fme_feature" type="java.lang.String"/>
+				<many-to-one name="priceByQuantity" entity-name="PriceByQuantityType" lazy="false" cascade="all" foreign-key="producttype_pricebyquantity" insert="true" update="true" not-null="false">
+					<column not-null="false" unique="false" name="`group1_pricebyquantitytype_pricebyquantity_e_id`"/>
+				</many-to-one>
+				<many-to-one name="priceFromSupplier" entity-name="SupplierPriceType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_pricefromsupplier" insert="true" update="true" not-null="false">
+					<column not-null="false" unique="false" name="`group1_supplierpricetype_pricefromsupplier_e_id`"/>
+				</many-to-one>
+				<property name="simplePrice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+					<column not-null="false" unique="false" name="`group1_simpleprice`"/>
+				</property>
+			</composite-element>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.SupplierPriceTypeImpl" entity-name="SupplierPriceType" abstract="false" lazy="false" table="`supplierpricetype`">
+		<meta attribute="eclassName">SupplierPriceType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.TranslatedDescriptionTypeImpl" entity-name="TranslatedDescriptionType" abstract="false" lazy="false" table="`translateddescriptiontype`">
+		<meta attribute="eclassName">TranslatedDescriptionType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="language" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`language`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..5af952a97
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,13 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="featuremap.ProductClassificationObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+		<param name="edatatype">ProductClassificationObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.PriceByQuantityTypeImpl" entity-name="PriceByQuantityType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="PriceByQuantityType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ProductType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.SupplierPriceTypeImpl" entity-name="SupplierPriceType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SupplierPriceType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.TranslatedDescriptionTypeImpl" entity-name="TranslatedDescriptionType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TranslatedDescriptionType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..5af952a97
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,13 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="featuremap.ProductClassificationObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+		<param name="edatatype">ProductClassificationObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.PriceByQuantityTypeImpl" entity-name="PriceByQuantityType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="PriceByQuantityType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ProductType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.SupplierPriceTypeImpl" entity-name="SupplierPriceType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SupplierPriceType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.TranslatedDescriptionTypeImpl" entity-name="TranslatedDescriptionType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TranslatedDescriptionType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..5af952a97
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.elist/FeatureMapEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,13 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="featuremap.ProductClassificationObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+		<param name="edatatype">ProductClassificationObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.PriceByQuantityTypeImpl" entity-name="PriceByQuantityType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="PriceByQuantityType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ProductType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.SupplierPriceTypeImpl" entity-name="SupplierPriceType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SupplierPriceType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.TranslatedDescriptionTypeImpl" entity-name="TranslatedDescriptionType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TranslatedDescriptionType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/AccountingTest$1_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/AccountingTest$1_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..78e1ae74b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/AccountingTest$1_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,246 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl" entity-name="Account" abstract="true" lazy="false" discriminator-value="Account" table="`account`">
+		<meta attribute="eclassName">Account</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</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 type="string">
+			<column name="dtype" index="accountdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountGroupImpl" entity-name="AccountGroup" abstract="false" lazy="false" discriminator-value="AccountGroup" table="`accountgroup`">
+		<meta attribute="eclassName">AccountGroup</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</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 type="string">
+			<column name="dtype" index="accountgroupdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="account" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="accountgroup_account">
+				<column name="`accountgroup_account_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accountgroup_account_idx`"/>
+			<one-to-many entity-name="Account"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountingImpl" entity-name="Accounting" abstract="false" lazy="false" discriminator-value="Accounting" table="`accounting`">
+		<meta attribute="eclassName">Accounting</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</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 type="string">
+			<column name="dtype" index="accountingdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="accountGroup" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="accounting_accountgroup">
+				<column name="`accounting_accountgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accounting_accountgroup_idx`"/>
+			<one-to-many entity-name="AccountGroup"/>
+		</list>
+		<list name="vat" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="accounting_vat">
+				<column name="`accounting_vat_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accounting_vat_idx`"/>
+			<one-to-many entity-name="Vat"/>
+		</list>
+		<many-to-one name="vatAccount" entity-name="BalanceAccount" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="accounting_vataccount" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`balanceaccount_vataccount_e_id`"/>
+		</many-to-one>
+		<many-to-one name="report" entity-name="Report" lazy="false" cascade="all" foreign-key="accounting_report" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`report_report_e_id`"/>
+		</many-to-one>
+		<list name="journalGroup" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="accounting_journalgroup">
+				<column name="`accounting_journalgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accounting_journalgroup_idx`"/>
+			<one-to-many entity-name="JournalGroup"/>
+		</list>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.BalanceAccountImpl" entity-name="BalanceAccount" abstract="false" lazy="false" extends="Account" discriminator-value="BalanceAccount">
+		<meta attribute="eclassName">BalanceAccount</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<list name="report" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`balanceaccount_reportgroup`">
+			<key update="true">
+				<column name="`balanceaccount_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`balanceaccount_report_idx`"/>
+			<many-to-many entity-name="ReportGroup" unique="false" foreign-key="balanceaccount_report">
+				<column name="`reportgroup_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.JournalGroupImpl" entity-name="JournalGroup" abstract="false" lazy="false" discriminator-value="JournalGroup" table="`journalgroup`">
+		<meta attribute="eclassName">JournalGroup</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</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 type="string">
+			<column name="dtype" index="journalgroupdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="journalGroups" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="journalgroup_journalgroups">
+				<column name="`journalgroup_journalgroups_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`journalgroup_journalgroups_idx`"/>
+			<one-to-many entity-name="JournalGroup"/>
+		</list>
+		<list name="journalStatements" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="journalgroup_journalstatements">
+				<column name="`journalgroup_journalstatements_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`journalgroup_journalstatements_idx`"/>
+			<one-to-many entity-name="JournalStatement"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.JournalStatementImpl" entity-name="JournalStatement" abstract="false" lazy="false" discriminator-value="JournalStatement" table="`journalstatement`">
+		<meta attribute="eclassName">JournalStatement</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</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 type="string">
+			<column name="dtype" index="journalstatementdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="date" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`date`"/>
+		</property>
+		<property name="amount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`amount`"/>
+		</property>
+		<many-to-one name="debitAccount" entity-name="Account" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="journalstatement_debitaccount" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`account_debitaccount_e_id`"/>
+		</many-to-one>
+		<many-to-one name="creditAccount" entity-name="Account" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="journalstatement_creditaccount" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`account_creditaccount_e_id`"/>
+		</many-to-one>
+		<many-to-one name="vat" entity-name="Vat" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="journalstatement_vat" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`vat_vat_e_id`"/>
+		</many-to-one>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.PLAccountImpl" entity-name="PLAccount" abstract="false" lazy="false" extends="Account" discriminator-value="PLAccount">
+		<meta attribute="eclassName">PLAccount</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportImpl" entity-name="Report" abstract="false" lazy="false" discriminator-value="Report" table="`report`">
+		<meta attribute="eclassName">Report</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</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 type="string">
+			<column name="dtype" index="reportdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="debitReportGroup" entity-name="ReportGroup" lazy="false" cascade="all" foreign-key="report_debitreportgroup" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`reportgroup_debitreportgroup_e_id`"/>
+		</many-to-one>
+		<many-to-one name="creditReportGroup" entity-name="ReportGroup" lazy="false" cascade="all" foreign-key="report_creditreportgroup" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`reportgroup_creditreportgroup_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportGroupImpl" entity-name="ReportGroup" abstract="false" lazy="false" discriminator-value="ReportGroup" table="`reportgroup`">
+		<meta attribute="eclassName">ReportGroup</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</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 type="string">
+			<column name="dtype" index="reportgroupdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="reportGroup" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="reportgroup_reportgroup">
+				<column name="`reportgroup_reportgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`reportgroup_reportgroup_idx`"/>
+			<one-to-many entity-name="ReportGroup"/>
+		</list>
+		<list name="account" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`reportgroup_balanceaccount`">
+			<key update="true">
+				<column name="`reportgroup_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`reportgroup_account_idx`"/>
+			<many-to-many entity-name="BalanceAccount" unique="false" foreign-key="reportgroup_account">
+				<column name="`balanceaccount_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.VatImpl" entity-name="Vat" abstract="false" lazy="false" discriminator-value="Vat" table="`vat`">
+		<meta attribute="eclassName">Vat</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</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 type="string">
+			<column name="dtype" index="vatdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="rate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`rate`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/AccountingTest$1_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/AccountingTest$1_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..55744b4d5
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/AccountingTest$1_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,228 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl" entity-name="Account" abstract="true" lazy="false" table="`account`">
+		<meta attribute="eclassName" inherit="false">Account</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountGroupImpl" entity-name="AccountGroup" abstract="false" lazy="false" table="`accountgroup`">
+		<meta attribute="eclassName" inherit="false">AccountGroup</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="account" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="accountgroup_account">
+				<column name="`accountgroup_account_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accountgroup_account_idx`"/>
+			<one-to-many entity-name="Account"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountingImpl" entity-name="Accounting" abstract="false" lazy="false" table="`accounting`">
+		<meta attribute="eclassName" inherit="false">Accounting</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="accountGroup" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="accounting_accountgroup">
+				<column name="`accounting_accountgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accounting_accountgroup_idx`"/>
+			<one-to-many entity-name="AccountGroup"/>
+		</list>
+		<list name="vat" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="accounting_vat">
+				<column name="`accounting_vat_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accounting_vat_idx`"/>
+			<one-to-many entity-name="Vat"/>
+		</list>
+		<many-to-one name="vatAccount" entity-name="BalanceAccount" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="accounting_vataccount" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`balanceaccount_vataccount_e_id`"/>
+		</many-to-one>
+		<many-to-one name="report" entity-name="Report" lazy="false" cascade="all" foreign-key="accounting_report" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`report_report_e_id`"/>
+		</many-to-one>
+		<list name="journalGroup" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="accounting_journalgroup">
+				<column name="`accounting_journalgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accounting_journalgroup_idx`"/>
+			<one-to-many entity-name="JournalGroup"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.BalanceAccountImpl" entity-name="BalanceAccount" abstract="false" lazy="false" extends="Account" table="`balanceaccount`">
+		<meta attribute="eclassName" inherit="false">BalanceAccount</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<key>
+			<column name="`account_e_id`"/>
+		</key>
+		<list name="report" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`balanceaccount_reportgroup`">
+			<key update="true">
+				<column name="`balanceaccount_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`balanceaccount_report_idx`"/>
+			<many-to-many entity-name="ReportGroup" unique="false" foreign-key="balanceaccount_report">
+				<column name="`reportgroup_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.JournalGroupImpl" entity-name="JournalGroup" abstract="false" lazy="false" table="`journalgroup`">
+		<meta attribute="eclassName" inherit="false">JournalGroup</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="journalGroups" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="journalgroup_journalgroups">
+				<column name="`journalgroup_journalgroups_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`journalgroup_journalgroups_idx`"/>
+			<one-to-many entity-name="JournalGroup"/>
+		</list>
+		<list name="journalStatements" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="journalgroup_journalstatements">
+				<column name="`journalgroup_journalstatements_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`journalgroup_journalstatements_idx`"/>
+			<one-to-many entity-name="JournalStatement"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.JournalStatementImpl" entity-name="JournalStatement" abstract="false" lazy="false" table="`journalstatement`">
+		<meta attribute="eclassName" inherit="false">JournalStatement</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="date" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`date`"/>
+		</property>
+		<property name="amount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`amount`"/>
+		</property>
+		<many-to-one name="debitAccount" entity-name="Account" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="journalstatement_debitaccount" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`account_debitaccount_e_id`"/>
+		</many-to-one>
+		<many-to-one name="creditAccount" entity-name="Account" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="journalstatement_creditaccount" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`account_creditaccount_e_id`"/>
+		</many-to-one>
+		<many-to-one name="vat" entity-name="Vat" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="journalstatement_vat" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`vat_vat_e_id`"/>
+		</many-to-one>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.PLAccountImpl" entity-name="PLAccount" abstract="false" lazy="false" extends="Account" table="`placcount`">
+		<meta attribute="eclassName" inherit="false">PLAccount</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<key>
+			<column name="`account_e_id`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportImpl" entity-name="Report" abstract="false" lazy="false" table="`report`">
+		<meta attribute="eclassName" inherit="false">Report</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="debitReportGroup" entity-name="ReportGroup" lazy="false" cascade="all" foreign-key="report_debitreportgroup" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`reportgroup_debitreportgroup_e_id`"/>
+		</many-to-one>
+		<many-to-one name="creditReportGroup" entity-name="ReportGroup" lazy="false" cascade="all" foreign-key="report_creditreportgroup" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`reportgroup_creditreportgroup_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportGroupImpl" entity-name="ReportGroup" abstract="false" lazy="false" table="`reportgroup`">
+		<meta attribute="eclassName" inherit="false">ReportGroup</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="reportGroup" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="reportgroup_reportgroup">
+				<column name="`reportgroup_reportgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`reportgroup_reportgroup_idx`"/>
+			<one-to-many entity-name="ReportGroup"/>
+		</list>
+		<list name="account" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`reportgroup_balanceaccount`">
+			<key update="true">
+				<column name="`reportgroup_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`reportgroup_account_idx`"/>
+			<many-to-many entity-name="BalanceAccount" unique="false" foreign-key="reportgroup_account">
+				<column name="`balanceaccount_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.VatImpl" entity-name="Vat" abstract="false" lazy="false" table="`vat`">
+		<meta attribute="eclassName" inherit="false">Vat</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="rate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`rate`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/AccountingTest$1_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/AccountingTest$1_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..55744b4d5
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/AccountingTest$1_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,228 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountImpl" entity-name="Account" abstract="true" lazy="false" table="`account`">
+		<meta attribute="eclassName" inherit="false">Account</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountGroupImpl" entity-name="AccountGroup" abstract="false" lazy="false" table="`accountgroup`">
+		<meta attribute="eclassName" inherit="false">AccountGroup</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="account" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="accountgroup_account">
+				<column name="`accountgroup_account_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accountgroup_account_idx`"/>
+			<one-to-many entity-name="Account"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.AccountingImpl" entity-name="Accounting" abstract="false" lazy="false" table="`accounting`">
+		<meta attribute="eclassName" inherit="false">Accounting</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="accountGroup" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="accounting_accountgroup">
+				<column name="`accounting_accountgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accounting_accountgroup_idx`"/>
+			<one-to-many entity-name="AccountGroup"/>
+		</list>
+		<list name="vat" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="accounting_vat">
+				<column name="`accounting_vat_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accounting_vat_idx`"/>
+			<one-to-many entity-name="Vat"/>
+		</list>
+		<many-to-one name="vatAccount" entity-name="BalanceAccount" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="accounting_vataccount" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`balanceaccount_vataccount_e_id`"/>
+		</many-to-one>
+		<many-to-one name="report" entity-name="Report" lazy="false" cascade="all" foreign-key="accounting_report" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`report_report_e_id`"/>
+		</many-to-one>
+		<list name="journalGroup" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="accounting_journalgroup">
+				<column name="`accounting_journalgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accounting_journalgroup_idx`"/>
+			<one-to-many entity-name="JournalGroup"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.BalanceAccountImpl" entity-name="BalanceAccount" abstract="false" lazy="false" extends="Account" table="`balanceaccount`">
+		<meta attribute="eclassName" inherit="false">BalanceAccount</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<key>
+			<column name="`account_e_id`"/>
+		</key>
+		<list name="report" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`balanceaccount_reportgroup`">
+			<key update="true">
+				<column name="`balanceaccount_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`balanceaccount_report_idx`"/>
+			<many-to-many entity-name="ReportGroup" unique="false" foreign-key="balanceaccount_report">
+				<column name="`reportgroup_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.JournalGroupImpl" entity-name="JournalGroup" abstract="false" lazy="false" table="`journalgroup`">
+		<meta attribute="eclassName" inherit="false">JournalGroup</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="journalGroups" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="journalgroup_journalgroups">
+				<column name="`journalgroup_journalgroups_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`journalgroup_journalgroups_idx`"/>
+			<one-to-many entity-name="JournalGroup"/>
+		</list>
+		<list name="journalStatements" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="journalgroup_journalstatements">
+				<column name="`journalgroup_journalstatements_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`journalgroup_journalstatements_idx`"/>
+			<one-to-many entity-name="JournalStatement"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.JournalStatementImpl" entity-name="JournalStatement" abstract="false" lazy="false" table="`journalstatement`">
+		<meta attribute="eclassName" inherit="false">JournalStatement</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="date" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`date`"/>
+		</property>
+		<property name="amount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`amount`"/>
+		</property>
+		<many-to-one name="debitAccount" entity-name="Account" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="journalstatement_debitaccount" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`account_debitaccount_e_id`"/>
+		</many-to-one>
+		<many-to-one name="creditAccount" entity-name="Account" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="journalstatement_creditaccount" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`account_creditaccount_e_id`"/>
+		</many-to-one>
+		<many-to-one name="vat" entity-name="Vat" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="journalstatement_vat" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`vat_vat_e_id`"/>
+		</many-to-one>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.PLAccountImpl" entity-name="PLAccount" abstract="false" lazy="false" extends="Account" table="`placcount`">
+		<meta attribute="eclassName" inherit="false">PLAccount</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<key>
+			<column name="`account_e_id`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportImpl" entity-name="Report" abstract="false" lazy="false" table="`report`">
+		<meta attribute="eclassName" inherit="false">Report</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="debitReportGroup" entity-name="ReportGroup" lazy="false" cascade="all" foreign-key="report_debitreportgroup" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`reportgroup_debitreportgroup_e_id`"/>
+		</many-to-one>
+		<many-to-one name="creditReportGroup" entity-name="ReportGroup" lazy="false" cascade="all" foreign-key="report_creditreportgroup" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`reportgroup_creditreportgroup_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.ReportGroupImpl" entity-name="ReportGroup" abstract="false" lazy="false" table="`reportgroup`">
+		<meta attribute="eclassName" inherit="false">ReportGroup</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="reportGroup" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="reportgroup_reportgroup">
+				<column name="`reportgroup_reportgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`reportgroup_reportgroup_idx`"/>
+			<one-to-many entity-name="ReportGroup"/>
+		</list>
+		<list name="account" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`reportgroup_balanceaccount`">
+			<key update="true">
+				<column name="`reportgroup_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`reportgroup_account_idx`"/>
+			<many-to-many entity-name="BalanceAccount" unique="false" foreign-key="reportgroup_account">
+				<column name="`balanceaccount_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.accounting.impl.VatImpl" entity-name="Vat" abstract="false" lazy="false" table="`vat`">
+		<meta attribute="eclassName" inherit="false">Vat</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/accounting</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="rate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`rate`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/Bz292973$1_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/Bz292973$1_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ee32b44a2
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/Bz292973$1_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,100 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`" length="50"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/Bz292973$1_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/Bz292973$1_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..5107ea0dc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/Bz292973$1_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,93 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`" length="50"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/Bz292973$1_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/Bz292973$1_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ed75fabbe
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/Bz292973$1_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,91 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`" length="50"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CapaTest$1_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CapaTest$1_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d3c9bf020
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CapaTest$1_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,186 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.CapacityEntryImpl" entity-name="CapacityEntry" abstract="false" lazy="false" discriminator-value="CapacityEntry" table="`capacityentry`">
+		<meta attribute="eclassName">CapacityEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</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 type="string">
+			<column name="dtype" index="capacityentrydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="capacityEntryId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`capacityentryid`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.MachineImpl" entity-name="Machine" abstract="false" lazy="false" discriminator-value="Machine" table="`machine`">
+		<meta attribute="eclassName">Machine</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</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 type="string">
+			<column name="dtype" index="machinedtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="workWeek" entity-name="WorkWeek" lazy="false" cascade="all" foreign-key="machine_workweek" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`workweek_workweek_e_id`"/>
+		</many-to-one>
+		<property name="machineId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`machineid`"/>
+		</property>
+		<property name="machineSearchString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`machinesearchstring`"/>
+		</property>
+		<property name="multiplicity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`multiplicity`"/>
+		</property>
+		<property name="taskSearchString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`tasksearchstring`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.MachineListImpl" entity-name="MachineList" abstract="false" lazy="false" discriminator-value="MachineList" table="`machinelist`">
+		<meta attribute="eclassName">MachineList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</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 type="string">
+			<column name="dtype" index="machinelistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="machines" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="machinelist_machines">
+				<column name="`machinelist_machines_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`machinelist_machines_idx`"/>
+			<one-to-many entity-name="Machine"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.ProductionImpl" entity-name="Production" abstract="false" lazy="false" discriminator-value="Production" table="`production`">
+		<meta attribute="eclassName">Production</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</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 type="string">
+			<column name="dtype" index="productiondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="article" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`article`"/>
+		</property>
+		<property name="dueTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`duetime`"/>
+		</property>
+		<property name="missingAmount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`missingamount`"/>
+		</property>
+		<property name="productionId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`productionid`"/>
+		</property>
+		<property name="startTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`starttime`"/>
+		</property>
+		<property name="totalAmount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`totalamount`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.TaskImpl" entity-name="Task" abstract="false" lazy="false" discriminator-value="Task" table="`task`">
+		<meta attribute="eclassName">Task</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</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 type="string">
+			<column name="dtype" index="taskdtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="capacityEntry" entity-name="CapacityEntry" lazy="false" cascade="all" foreign-key="task_capacityentry" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`capacityentry_capacityentry_e_id`"/>
+		</many-to-one>
+		<many-to-one name="production" entity-name="Production" lazy="false" cascade="all" foreign-key="task_production" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`production_production_e_id`"/>
+		</many-to-one>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="taskId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`taskid`"/>
+		</property>
+		<property name="timePerPice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`timeperpice`"/>
+		</property>
+		<property name="timePerPreperation" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`timeperpreperation`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.WorkDayImpl" entity-name="WorkDay" abstract="false" lazy="false" discriminator-value="WorkDay" table="`workday`">
+		<meta attribute="eclassName">WorkDay</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</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 type="string">
+			<column name="dtype" index="workdaydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="dayOfWeek" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`dayofweek`"/>
+		</property>
+		<property name="duration" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`duration`"/>
+		</property>
+		<property name="startTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`starttime`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.WorkWeekImpl" entity-name="WorkWeek" abstract="false" lazy="false" discriminator-value="WorkWeek" table="`workweek`">
+		<meta attribute="eclassName">WorkWeek</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</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 type="string">
+			<column name="dtype" index="workweekdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="days" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="workweek_days">
+				<column name="`workweek_days_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workweek_days_idx`"/>
+			<one-to-many entity-name="WorkDay"/>
+		</list>
+		<property name="workWeekId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`workweekid`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CapaTest$1_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CapaTest$1_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..409c238e6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CapaTest$1_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,165 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.CapacityEntryImpl" entity-name="CapacityEntry" abstract="false" lazy="false" table="`capacityentry`">
+		<meta attribute="eclassName" inherit="false">CapacityEntry</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="capacityEntryId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`capacityentryid`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.MachineImpl" entity-name="Machine" abstract="false" lazy="false" table="`machine`">
+		<meta attribute="eclassName" inherit="false">Machine</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="workWeek" entity-name="WorkWeek" lazy="false" cascade="all" foreign-key="machine_workweek" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`workweek_workweek_e_id`"/>
+		</many-to-one>
+		<property name="machineId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`machineid`"/>
+		</property>
+		<property name="machineSearchString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`machinesearchstring`"/>
+		</property>
+		<property name="multiplicity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`multiplicity`"/>
+		</property>
+		<property name="taskSearchString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`tasksearchstring`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.MachineListImpl" entity-name="MachineList" abstract="false" lazy="false" table="`machinelist`">
+		<meta attribute="eclassName" inherit="false">MachineList</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="machines" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="machinelist_machines">
+				<column name="`machinelist_machines_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`machinelist_machines_idx`"/>
+			<one-to-many entity-name="Machine"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.ProductionImpl" entity-name="Production" abstract="false" lazy="false" table="`production`">
+		<meta attribute="eclassName" inherit="false">Production</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="article" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`article`"/>
+		</property>
+		<property name="dueTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`duetime`"/>
+		</property>
+		<property name="missingAmount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`missingamount`"/>
+		</property>
+		<property name="productionId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`productionid`"/>
+		</property>
+		<property name="startTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`starttime`"/>
+		</property>
+		<property name="totalAmount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`totalamount`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.TaskImpl" entity-name="Task" abstract="false" lazy="false" table="`task`">
+		<meta attribute="eclassName" inherit="false">Task</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="capacityEntry" entity-name="CapacityEntry" lazy="false" cascade="all" foreign-key="task_capacityentry" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`capacityentry_capacityentry_e_id`"/>
+		</many-to-one>
+		<many-to-one name="production" entity-name="Production" lazy="false" cascade="all" foreign-key="task_production" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`production_production_e_id`"/>
+		</many-to-one>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="taskId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`taskid`"/>
+		</property>
+		<property name="timePerPice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`timeperpice`"/>
+		</property>
+		<property name="timePerPreperation" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`timeperpreperation`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.WorkDayImpl" entity-name="WorkDay" abstract="false" lazy="false" table="`workday`">
+		<meta attribute="eclassName" inherit="false">WorkDay</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="dayOfWeek" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`dayofweek`"/>
+		</property>
+		<property name="duration" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`duration`"/>
+		</property>
+		<property name="startTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`starttime`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.WorkWeekImpl" entity-name="WorkWeek" abstract="false" lazy="false" table="`workweek`">
+		<meta attribute="eclassName" inherit="false">WorkWeek</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="days" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="workweek_days">
+				<column name="`workweek_days_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workweek_days_idx`"/>
+			<one-to-many entity-name="WorkDay"/>
+		</list>
+		<property name="workWeekId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`workweekid`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CapaTest$1_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CapaTest$1_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..409c238e6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CapaTest$1_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,165 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.CapacityEntryImpl" entity-name="CapacityEntry" abstract="false" lazy="false" table="`capacityentry`">
+		<meta attribute="eclassName" inherit="false">CapacityEntry</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="capacityEntryId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`capacityentryid`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.MachineImpl" entity-name="Machine" abstract="false" lazy="false" table="`machine`">
+		<meta attribute="eclassName" inherit="false">Machine</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="workWeek" entity-name="WorkWeek" lazy="false" cascade="all" foreign-key="machine_workweek" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`workweek_workweek_e_id`"/>
+		</many-to-one>
+		<property name="machineId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`machineid`"/>
+		</property>
+		<property name="machineSearchString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`machinesearchstring`"/>
+		</property>
+		<property name="multiplicity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`multiplicity`"/>
+		</property>
+		<property name="taskSearchString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`tasksearchstring`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.MachineListImpl" entity-name="MachineList" abstract="false" lazy="false" table="`machinelist`">
+		<meta attribute="eclassName" inherit="false">MachineList</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="machines" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="machinelist_machines">
+				<column name="`machinelist_machines_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`machinelist_machines_idx`"/>
+			<one-to-many entity-name="Machine"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.ProductionImpl" entity-name="Production" abstract="false" lazy="false" table="`production`">
+		<meta attribute="eclassName" inherit="false">Production</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="article" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`article`"/>
+		</property>
+		<property name="dueTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`duetime`"/>
+		</property>
+		<property name="missingAmount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`missingamount`"/>
+		</property>
+		<property name="productionId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`productionid`"/>
+		</property>
+		<property name="startTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`starttime`"/>
+		</property>
+		<property name="totalAmount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`totalamount`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.TaskImpl" entity-name="Task" abstract="false" lazy="false" table="`task`">
+		<meta attribute="eclassName" inherit="false">Task</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="capacityEntry" entity-name="CapacityEntry" lazy="false" cascade="all" foreign-key="task_capacityentry" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`capacityentry_capacityentry_e_id`"/>
+		</many-to-one>
+		<many-to-one name="production" entity-name="Production" lazy="false" cascade="all" foreign-key="task_production" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`production_production_e_id`"/>
+		</many-to-one>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="taskId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`taskid`"/>
+		</property>
+		<property name="timePerPice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`timeperpice`"/>
+		</property>
+		<property name="timePerPreperation" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`timeperpreperation`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.WorkDayImpl" entity-name="WorkDay" abstract="false" lazy="false" table="`workday`">
+		<meta attribute="eclassName" inherit="false">WorkDay</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="dayOfWeek" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`dayofweek`"/>
+		</property>
+		<property name="duration" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`duration`"/>
+		</property>
+		<property name="startTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`starttime`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.capa.impl.WorkWeekImpl" entity-name="WorkWeek" abstract="false" lazy="false" table="`workweek`">
+		<meta attribute="eclassName" inherit="false">WorkWeek</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/capa</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="days" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="workweek_days">
+				<column name="`workweek_days_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workweek_days_idx`"/>
+			<one-to-many entity-name="WorkDay"/>
+		</list>
+		<property name="workWeekId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`workweekid`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CatalogTest$1_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CatalogTest$1_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ad1e6f49f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CatalogTest$1_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,126 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.CatalogTypeImpl" entity-name="CatalogType" abstract="false" lazy="false" discriminator-value="CatalogType" table="`catalogtype`">
+		<meta attribute="eclassName">CatalogType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="catalogtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="catalogtype_subcatalog">
+				<column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`catalogtype_subcatalog_idx`"/>
+			<one-to-many entity-name="CatalogType"/>
+		</list>
+		<list name="product" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="catalogtype_product">
+				<column name="`catalogtype_product_name`" not-null="false" unique="false">
+					<comment>My product</comment>
+				</column>
+			</key>
+			<list-index column="`catalogtype_product_idx`"/>
+			<one-to-many entity-name="ProductType"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.PriceTypeImpl" entity-name="PriceType" abstract="false" lazy="false" discriminator-value="PriceType" table="`pricetype`">
+		<meta attribute="eclassName">PriceType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</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 type="string">
+			<column name="dtype" index="pricetypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="quantityTo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`quantityto`"/>
+		</property>
+		<many-to-one name="supplier" entity-name="SupplierType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="pricetype_supplier" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`suppliertype_supplier_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`">
+		<meta attribute="eclassName">ProductType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<comment>My product</comment>
+		<id name="code" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="producttypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`description`">
+				<comment>My descrip</comment>
+			</column>
+		</property>
+		<list name="remark" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="producttype_remark">
+				<column name="`producttype_remark_code`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_remark_idx`"/>
+			<one-to-many entity-name="StringType"/>
+		</list>
+		<many-to-one name="price" entity-name="PriceType" lazy="false" cascade="all" foreign-key="producttype_price" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`pricetype_price_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.StringTypeImpl" entity-name="StringType" abstract="false" lazy="false" discriminator-value="StringType" table="`stringtype`">
+		<meta attribute="eclassName">StringType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</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 type="string">
+			<column name="dtype" index="stringtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<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" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.SupplierTypeImpl" entity-name="SupplierType" abstract="false" lazy="false" discriminator-value="SupplierType" table="`suppliertype`">
+		<meta attribute="eclassName">SupplierType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</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 type="string">
+			<column name="dtype" index="suppliertypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="noOfEmployees" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`noofemployees`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CatalogTest$1_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CatalogTest$1_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..130954d68
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CatalogTest$1_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,111 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.CatalogTypeImpl" entity-name="CatalogType" abstract="false" lazy="false" table="`catalogtype`">
+		<meta attribute="eclassName" inherit="false">CatalogType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="catalogtype_subcatalog">
+				<column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`catalogtype_subcatalog_idx`"/>
+			<one-to-many entity-name="CatalogType"/>
+		</list>
+		<list name="product" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="catalogtype_product">
+				<column name="`catalogtype_product_name`" not-null="false" unique="false">
+					<comment>My product</comment>
+				</column>
+			</key>
+			<list-index column="`catalogtype_product_idx`"/>
+			<one-to-many entity-name="ProductType"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.PriceTypeImpl" entity-name="PriceType" abstract="false" lazy="false" table="`pricetype`">
+		<meta attribute="eclassName" inherit="false">PriceType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="quantityTo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`quantityto`"/>
+		</property>
+		<many-to-one name="supplier" entity-name="SupplierType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="pricetype_supplier" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`suppliertype_supplier_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" table="`producttype`">
+		<meta attribute="eclassName" inherit="false">ProductType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<comment>My product</comment>
+		<id name="code" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<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`">
+				<comment>My descrip</comment>
+			</column>
+		</property>
+		<list name="remark" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="producttype_remark">
+				<column name="`producttype_remark_code`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_remark_idx`"/>
+			<one-to-many entity-name="StringType"/>
+		</list>
+		<many-to-one name="price" entity-name="PriceType" lazy="false" cascade="all" foreign-key="producttype_price" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`pricetype_price_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.StringTypeImpl" entity-name="StringType" abstract="false" lazy="false" table="`stringtype`">
+		<meta attribute="eclassName" inherit="false">StringType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.SupplierTypeImpl" entity-name="SupplierType" abstract="false" lazy="false" table="`suppliertype`">
+		<meta attribute="eclassName" inherit="false">SupplierType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="noOfEmployees" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`noofemployees`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CatalogTest$1_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CatalogTest$1_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..130954d68
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CatalogTest$1_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,111 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.CatalogTypeImpl" entity-name="CatalogType" abstract="false" lazy="false" table="`catalogtype`">
+		<meta attribute="eclassName" inherit="false">CatalogType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="catalogtype_subcatalog">
+				<column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`catalogtype_subcatalog_idx`"/>
+			<one-to-many entity-name="CatalogType"/>
+		</list>
+		<list name="product" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="catalogtype_product">
+				<column name="`catalogtype_product_name`" not-null="false" unique="false">
+					<comment>My product</comment>
+				</column>
+			</key>
+			<list-index column="`catalogtype_product_idx`"/>
+			<one-to-many entity-name="ProductType"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.PriceTypeImpl" entity-name="PriceType" abstract="false" lazy="false" table="`pricetype`">
+		<meta attribute="eclassName" inherit="false">PriceType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="quantityTo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`quantityto`"/>
+		</property>
+		<many-to-one name="supplier" entity-name="SupplierType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="pricetype_supplier" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`suppliertype_supplier_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" table="`producttype`">
+		<meta attribute="eclassName" inherit="false">ProductType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<comment>My product</comment>
+		<id name="code" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<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`">
+				<comment>My descrip</comment>
+			</column>
+		</property>
+		<list name="remark" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="producttype_remark">
+				<column name="`producttype_remark_code`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_remark_idx`"/>
+			<one-to-many entity-name="StringType"/>
+		</list>
+		<many-to-one name="price" entity-name="PriceType" lazy="false" cascade="all" foreign-key="producttype_price" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`pricetype_price_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.StringTypeImpl" entity-name="StringType" abstract="false" lazy="false" table="`stringtype`">
+		<meta attribute="eclassName" inherit="false">StringType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.SupplierTypeImpl" entity-name="SupplierType" abstract="false" lazy="false" table="`suppliertype`">
+		<meta attribute="eclassName" inherit="false">SupplierType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="noOfEmployees" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`noofemployees`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DetachFromSessionAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DetachFromSessionAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c8ecc0539
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DetachFromSessionAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DetachFromSessionAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DetachFromSessionAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7aa6cdb03
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DetachFromSessionAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DetachFromSessionAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DetachFromSessionAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d4e470760
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DetachFromSessionAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..79d1efdfb
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,45 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl.PersonImpl" entity-name="Person" abstract="false" lazy="true" discriminator-value="Person" table="`person`" proxy="org.eclipse.emf.teneo.samples.emf.sample.dynamic.Person">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/dynamic</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 type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="group" table="`person_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`person_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_group_idx`"/>
+			<one-to-many entity-name="Person_group"/>
+		</list>
+	</class>
+	<class entity-name="Person_group" lazy="false" table="`person_group`">
+		<meta attribute="featureMap">Person</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`group_age`"/>
+		</property>
+		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`group_length`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..32cc84e56
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,42 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl.PersonImpl" entity-name="Person" abstract="false" lazy="true" table="`person`" proxy="org.eclipse.emf.teneo.samples.emf.sample.dynamic.Person">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/dynamic</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="group" table="`person_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`person_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_group_idx`"/>
+			<one-to-many entity-name="Person_group"/>
+		</list>
+	</class>
+	<class entity-name="Person_group" lazy="false" table="`person_group`">
+		<meta attribute="featureMap" inherit="false">Person</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`group_age`"/>
+		</property>
+		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`group_length`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..32cc84e56
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,42 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl.PersonImpl" entity-name="Person" abstract="false" lazy="true" table="`person`" proxy="org.eclipse.emf.teneo.samples.emf.sample.dynamic.Person">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/dynamic</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="group" table="`person_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`person_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_group_idx`"/>
+			<one-to-many entity-name="Person_group"/>
+		</list>
+	</class>
+	<class entity-name="Person_group" lazy="false" table="`person_group`">
+		<meta attribute="featureMap" inherit="false">Person</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`group_age`"/>
+		</property>
+		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`group_length`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a4d1c780d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl.PersonImpl" entity-name="Person" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Person" proxy="org.eclipse.emf.teneo.samples.emf.sample.dynamic.Person"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a4d1c780d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl.PersonImpl" entity-name="Person" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Person" proxy="org.eclipse.emf.teneo.samples.emf.sample.dynamic.Person"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a4d1c780d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl.PersonImpl" entity-name="Person" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Person" proxy="org.eclipse.emf.teneo.samples.emf.sample.dynamic.Person"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEAVNoDBSchemaAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEAVNoDBSchemaAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a4d1c780d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEAVNoDBSchemaAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl.PersonImpl" entity-name="Person" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Person" proxy="org.eclipse.emf.teneo.samples.emf.sample.dynamic.Person"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEmbeddedIdAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEmbeddedIdAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..5dce66485
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEmbeddedIdAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,22 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.ecore.impl.DynamicEObjectImpl" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http:///www.elver.org/org.eclipse.emf.teneo.hibernate.test.emf.sample.DynamicEmbeddedIdAction</meta>
+		<composite-id name="name" class="org.eclipse.emf.teneo.hibernate.mapping.SerializableDynamicEObjectImpl" access="org.eclipse.emf.teneo.hibernate.mapping.property.EReferencePropertyHandler">
+			<meta attribute="eclassName" inherit="false">Name</meta>
+			<meta attribute="epackage" inherit="false">http:///www.elver.org/org.eclipse.emf.teneo.hibernate.test.emf.sample.DynamicEmbeddedIdAction</meta>
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEmbeddedIdAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEmbeddedIdAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..5dce66485
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicEmbeddedIdAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,22 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.ecore.impl.DynamicEObjectImpl" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http:///www.elver.org/org.eclipse.emf.teneo.hibernate.test.emf.sample.DynamicEmbeddedIdAction</meta>
+		<composite-id name="name" class="org.eclipse.emf.teneo.hibernate.mapping.SerializableDynamicEObjectImpl" access="org.eclipse.emf.teneo.hibernate.mapping.property.EReferencePropertyHandler">
+			<meta attribute="eclassName" inherit="false">Name</meta>
+			<meta attribute="epackage" inherit="false">http:///www.elver.org/org.eclipse.emf.teneo.hibernate.test.emf.sample.DynamicEmbeddedIdAction</meta>
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicNoDbSchemaUpdateAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicNoDbSchemaUpdateAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ab81108c8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicNoDbSchemaUpdateAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,127 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl.PersonImpl" entity-name="Person" abstract="false" lazy="true" table="`person`" proxy="org.eclipse.emf.teneo.samples.emf.sample.dynamic.Person">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/dynamic</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="group" table="`person_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`person_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_group_idx`"/>
+			<one-to-many entity-name="Person_group"/>
+		</list>
+	</class>
+	<class entity-name="Person_group" lazy="false" table="`person_group`">
+		<meta attribute="featureMap" inherit="false">Person</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`group_age`"/>
+		</property>
+		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`group_length`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl.PersonImpl" entity-name="Employee" abstract="false" lazy="true" extends="Person" table="`employee`" proxy="org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl.PersonImpl">
+		<meta attribute="eclassName" inherit="false">Employee</meta>
+		<meta attribute="epackage" inherit="false">http:///www.elver.org/DynamicTest</meta>
+		<key>
+			<column name="`person_e_id`"/>
+		</key>
+		<property name="manager" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`manager`"/>
+		</property>
+		<many-to-one name="department" entity-name="Department" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="employee_department" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`department_department_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl.PersonImpl" entity-name="SpecialEmployee" abstract="false" lazy="true" extends="Employee" table="`specialemployee`" proxy="org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl.PersonImpl">
+		<meta attribute="eclassName" inherit="false">SpecialEmployee</meta>
+		<meta attribute="epackage" inherit="false">http:///www.elver.org/DynamicTest</meta>
+		<key>
+			<column name="`employee_e_id`"/>
+		</key>
+		<list name="offices" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="specialemployee_offices">
+				<column name="`specialemployee_offices_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`specialemployee_offices_idx`"/>
+			<one-to-many entity-name="Office"/>
+		</list>
+	</joined-subclass>
+	<class entity-name="Department" abstract="false" lazy="true" table="`department`" proxy="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+		<meta attribute="eclassName" inherit="false">Department</meta>
+		<meta attribute="epackage" inherit="false">http:///www.elver.org/DynamicTest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="manager" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="department_manager">
+				<column name="`department_manager_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`department_manager_idx`"/>
+			<one-to-many entity-name="Employee"/>
+		</list>
+		<many-to-one name="office" entity-name="Office" lazy="proxy" cascade="all" foreign-key="department_office" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`office_office_name`"/>
+		</many-to-one>
+		<property name="departmentType" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`departmenttype`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DynamicENumUserType">
+				<param name="eclassifier">DepartmentType</param>
+				<param name="epackage">http:///www.elver.org/DynamicTest</param>
+			</type>
+		</property>
+	</class>
+	<class entity-name="Office" abstract="false" lazy="true" table="`office`" proxy="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+		<meta attribute="eclassName" inherit="false">Office</meta>
+		<meta attribute="epackage" inherit="false">http:///www.elver.org/DynamicTest</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<many-to-one name="address" entity-name="Address" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="office_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="Address" abstract="false" lazy="true" table="`address`" proxy="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+		<meta attribute="eclassName" inherit="false">Address</meta>
+		<meta attribute="epackage" inherit="false">http:///www.elver.org/DynamicTest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EcoreEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EcoreEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..203b9e321
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EcoreEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,112 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<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.EJavaClass" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EJavaClass</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="type.Duration" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">Duration</param>
+	</typedef>
+	<typedef name="type.ENTITIES" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ENTITIES</param>
+	</typedef>
+	<typedef name="type.ENTITIESBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ENTITIESBase</param>
+	</typedef>
+	<typedef name="type.IDREFS" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">IDREFS</param>
+	</typedef>
+	<typedef name="type.IDREFSBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">IDREFSBase</param>
+	</typedef>
+	<typedef name="type.NMTOKENS" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NMTOKENS</param>
+	</typedef>
+	<typedef name="type.NMTOKENSBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NMTOKENSBase</param>
+	</typedef>
+	<typedef name="type.NOTATION" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NOTATION</param>
+	</typedef>
+	<typedef name="type.QName" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">QName</param>
+	</typedef>
+	<typedef name="type.ShortObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ShortObject</param>
+	</typedef>
+	<typedef name="type.UnsignedByteObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">UnsignedByteObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.ecore.impl.BasicEObjectImpl" entity-name="ecore_EObject" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ecore_EObject"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EModelElementImpl" entity-name="EModelElement" abstract="true" lazy="false" extends="ecore_EObject" discriminator-value="EModelElement"/>
+	<subclass name="org.eclipse.emf.ecore.impl.ENamedElementImpl" entity-name="ENamedElement" abstract="true" lazy="false" extends="EModelElement" discriminator-value="ENamedElement"/>
+	<subclass name="org.eclipse.emf.ecore.impl.ETypedElementImpl" entity-name="ETypedElement" abstract="true" lazy="false" extends="ENamedElement" discriminator-value="ETypedElement"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EStructuralFeatureImpl" entity-name="EStructuralFeature" abstract="true" lazy="false" extends="ETypedElement" discriminator-value="EStructuralFeature"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EAttributeImpl" entity-name="EAttribute" abstract="false" lazy="false" extends="EStructuralFeature" discriminator-value="EAttribute"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EAnnotationImpl" entity-name="EAnnotation" abstract="false" lazy="false" extends="EModelElement" discriminator-value="EAnnotation"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EClassifierImpl" entity-name="EClassifier" abstract="true" lazy="false" extends="ENamedElement" discriminator-value="EClassifier"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EClassImpl" entity-name="EClass" abstract="false" lazy="false" extends="EClassifier" discriminator-value="EClass"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EDataTypeImpl" entity-name="EDataType" abstract="false" lazy="false" extends="EClassifier" discriminator-value="EDataType"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EEnumImpl" entity-name="EEnum" abstract="false" lazy="false" extends="EDataType" discriminator-value="EEnum"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EEnumLiteralImpl" entity-name="EEnumLiteral" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="EEnumLiteral"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EFactoryImpl" entity-name="EFactory" abstract="false" lazy="false" extends="EModelElement" discriminator-value="EFactory"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EOperationImpl" entity-name="EOperation" abstract="false" lazy="false" extends="ETypedElement" discriminator-value="EOperation"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EPackageImpl" entity-name="EPackage" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="EPackage"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EParameterImpl" entity-name="EParameter" abstract="false" lazy="false" extends="ETypedElement" discriminator-value="EParameter"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EReferenceImpl" entity-name="EReference" abstract="false" lazy="false" extends="EStructuralFeature" discriminator-value="EReference"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl" entity-name="EStringToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="EStringToStringMapEntry"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EGenericTypeImpl" entity-name="EGenericType" abstract="false" lazy="false" extends="ecore_EObject" discriminator-value="EGenericType"/>
+	<subclass name="org.eclipse.emf.ecore.impl.ETypeParameterImpl" entity-name="ETypeParameter" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="ETypeParameter"/>
+	<subclass name="org.eclipse.emf.ecore.xml.type.impl.AnyTypeImpl" entity-name="AnyType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="AnyType"/>
+	<subclass name="org.eclipse.emf.ecore.xml.type.impl.ProcessingInstructionImpl" entity-name="ProcessingInstruction" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ProcessingInstruction"/>
+	<subclass name="org.eclipse.emf.ecore.xml.type.impl.SimpleAnyTypeImpl" entity-name="SimpleAnyType" abstract="false" lazy="false" extends="AnyType" discriminator-value="SimpleAnyType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EcoreEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EcoreEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..518d0e3bc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EcoreEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,116 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<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.EJavaClass" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EJavaClass</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="ecore.EInvocationTargetException" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EInvocationTargetException</param>
+	</typedef>
+	<typedef name="type.Duration" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">Duration</param>
+	</typedef>
+	<typedef name="type.ENTITIES" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ENTITIES</param>
+	</typedef>
+	<typedef name="type.ENTITIESBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ENTITIESBase</param>
+	</typedef>
+	<typedef name="type.IDREFS" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">IDREFS</param>
+	</typedef>
+	<typedef name="type.IDREFSBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">IDREFSBase</param>
+	</typedef>
+	<typedef name="type.NMTOKENS" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NMTOKENS</param>
+	</typedef>
+	<typedef name="type.NMTOKENSBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NMTOKENSBase</param>
+	</typedef>
+	<typedef name="type.NOTATION" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NOTATION</param>
+	</typedef>
+	<typedef name="type.QName" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">QName</param>
+	</typedef>
+	<typedef name="type.ShortObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ShortObject</param>
+	</typedef>
+	<typedef name="type.UnsignedByteObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">UnsignedByteObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.ecore.impl.EModelElementImpl" entity-name="EModelElement" abstract="true" lazy="false" extends="EAV_EObject" discriminator-value="EModelElement"/>
+	<subclass name="org.eclipse.emf.ecore.impl.ENamedElementImpl" entity-name="ENamedElement" abstract="true" lazy="false" extends="EModelElement" discriminator-value="ENamedElement"/>
+	<subclass name="org.eclipse.emf.ecore.impl.ETypedElementImpl" entity-name="ETypedElement" abstract="true" lazy="false" extends="ENamedElement" discriminator-value="ETypedElement"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EStructuralFeatureImpl" entity-name="EStructuralFeature" abstract="true" lazy="false" extends="ETypedElement" discriminator-value="EStructuralFeature"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EAttributeImpl" entity-name="EAttribute" abstract="false" lazy="false" extends="EStructuralFeature" discriminator-value="EAttribute"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EAnnotationImpl" entity-name="EAnnotation" abstract="false" lazy="false" extends="EModelElement" discriminator-value="EAnnotation"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EClassifierImpl" entity-name="EClassifier" abstract="true" lazy="false" extends="ENamedElement" discriminator-value="EClassifier"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EClassImpl" entity-name="EClass" abstract="false" lazy="false" extends="EClassifier" discriminator-value="EClass"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EDataTypeImpl" entity-name="EDataType" abstract="false" lazy="false" extends="EClassifier" discriminator-value="EDataType"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EEnumImpl" entity-name="EEnum" abstract="false" lazy="false" extends="EDataType" discriminator-value="EEnum"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EEnumLiteralImpl" entity-name="EEnumLiteral" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="EEnumLiteral"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EFactoryImpl" entity-name="EFactory" abstract="false" lazy="false" extends="EModelElement" discriminator-value="EFactory"/>
+	<subclass name="org.eclipse.emf.ecore.impl.BasicEObjectImpl" entity-name="ecore_EObject" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ecore_EObject"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EOperationImpl" entity-name="EOperation" abstract="false" lazy="false" extends="ETypedElement" discriminator-value="EOperation"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EPackageImpl" entity-name="EPackage" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="EPackage"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EParameterImpl" entity-name="EParameter" abstract="false" lazy="false" extends="ETypedElement" discriminator-value="EParameter"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EReferenceImpl" entity-name="EReference" abstract="false" lazy="false" extends="EStructuralFeature" discriminator-value="EReference"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl" entity-name="EStringToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="EStringToStringMapEntry"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EGenericTypeImpl" entity-name="EGenericType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="EGenericType"/>
+	<subclass name="org.eclipse.emf.ecore.impl.ETypeParameterImpl" entity-name="ETypeParameter" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="ETypeParameter"/>
+	<subclass name="org.eclipse.emf.ecore.xml.type.impl.AnyTypeImpl" entity-name="AnyType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="AnyType"/>
+	<subclass name="org.eclipse.emf.ecore.xml.type.impl.ProcessingInstructionImpl" entity-name="ProcessingInstruction" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ProcessingInstruction"/>
+	<subclass name="org.eclipse.emf.ecore.xml.type.impl.SimpleAnyTypeImpl" entity-name="SimpleAnyType" abstract="false" lazy="false" extends="AnyType" discriminator-value="SimpleAnyType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EcoreEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EcoreEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..518d0e3bc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EcoreEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,116 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<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.EJavaClass" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EJavaClass</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="ecore.EInvocationTargetException" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EInvocationTargetException</param>
+	</typedef>
+	<typedef name="type.Duration" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">Duration</param>
+	</typedef>
+	<typedef name="type.ENTITIES" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ENTITIES</param>
+	</typedef>
+	<typedef name="type.ENTITIESBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ENTITIESBase</param>
+	</typedef>
+	<typedef name="type.IDREFS" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">IDREFS</param>
+	</typedef>
+	<typedef name="type.IDREFSBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">IDREFSBase</param>
+	</typedef>
+	<typedef name="type.NMTOKENS" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NMTOKENS</param>
+	</typedef>
+	<typedef name="type.NMTOKENSBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NMTOKENSBase</param>
+	</typedef>
+	<typedef name="type.NOTATION" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NOTATION</param>
+	</typedef>
+	<typedef name="type.QName" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">QName</param>
+	</typedef>
+	<typedef name="type.ShortObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ShortObject</param>
+	</typedef>
+	<typedef name="type.UnsignedByteObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">UnsignedByteObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.ecore.impl.EModelElementImpl" entity-name="EModelElement" abstract="true" lazy="false" extends="EAV_EObject" discriminator-value="EModelElement"/>
+	<subclass name="org.eclipse.emf.ecore.impl.ENamedElementImpl" entity-name="ENamedElement" abstract="true" lazy="false" extends="EModelElement" discriminator-value="ENamedElement"/>
+	<subclass name="org.eclipse.emf.ecore.impl.ETypedElementImpl" entity-name="ETypedElement" abstract="true" lazy="false" extends="ENamedElement" discriminator-value="ETypedElement"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EStructuralFeatureImpl" entity-name="EStructuralFeature" abstract="true" lazy="false" extends="ETypedElement" discriminator-value="EStructuralFeature"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EAttributeImpl" entity-name="EAttribute" abstract="false" lazy="false" extends="EStructuralFeature" discriminator-value="EAttribute"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EAnnotationImpl" entity-name="EAnnotation" abstract="false" lazy="false" extends="EModelElement" discriminator-value="EAnnotation"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EClassifierImpl" entity-name="EClassifier" abstract="true" lazy="false" extends="ENamedElement" discriminator-value="EClassifier"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EClassImpl" entity-name="EClass" abstract="false" lazy="false" extends="EClassifier" discriminator-value="EClass"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EDataTypeImpl" entity-name="EDataType" abstract="false" lazy="false" extends="EClassifier" discriminator-value="EDataType"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EEnumImpl" entity-name="EEnum" abstract="false" lazy="false" extends="EDataType" discriminator-value="EEnum"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EEnumLiteralImpl" entity-name="EEnumLiteral" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="EEnumLiteral"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EFactoryImpl" entity-name="EFactory" abstract="false" lazy="false" extends="EModelElement" discriminator-value="EFactory"/>
+	<subclass name="org.eclipse.emf.ecore.impl.BasicEObjectImpl" entity-name="ecore_EObject" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ecore_EObject"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EOperationImpl" entity-name="EOperation" abstract="false" lazy="false" extends="ETypedElement" discriminator-value="EOperation"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EPackageImpl" entity-name="EPackage" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="EPackage"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EParameterImpl" entity-name="EParameter" abstract="false" lazy="false" extends="ETypedElement" discriminator-value="EParameter"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EReferenceImpl" entity-name="EReference" abstract="false" lazy="false" extends="EStructuralFeature" discriminator-value="EReference"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl" entity-name="EStringToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="EStringToStringMapEntry"/>
+	<subclass name="org.eclipse.emf.ecore.impl.EGenericTypeImpl" entity-name="EGenericType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="EGenericType"/>
+	<subclass name="org.eclipse.emf.ecore.impl.ETypeParameterImpl" entity-name="ETypeParameter" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="ETypeParameter"/>
+	<subclass name="org.eclipse.emf.ecore.xml.type.impl.AnyTypeImpl" entity-name="AnyType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="AnyType"/>
+	<subclass name="org.eclipse.emf.ecore.xml.type.impl.ProcessingInstructionImpl" entity-name="ProcessingInstruction" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ProcessingInstruction"/>
+	<subclass name="org.eclipse.emf.ecore.xml.type.impl.SimpleAnyTypeImpl" entity-name="SimpleAnyType" abstract="false" lazy="false" extends="AnyType" discriminator-value="SimpleAnyType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EmployeeAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EmployeeAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e68fde488
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EmployeeAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,69 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.employee.impl.DepartmentImpl" entity-name="Department" abstract="false" lazy="false" discriminator-value="Department" table="`department`">
+		<meta attribute="eclassName">Department</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Employee</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 type="string">
+			<column name="dtype" index="departmentdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="employees" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="department_employees">
+				<column name="`department_employees_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Employee"/>
+			<filter name="ageRange" condition="age between :fromAge and :toAge"/>
+			<filter name="salaryHigherThan" condition="salary > :salary"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.employee.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" discriminator-value="Employee" table="`employee`">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Employee</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 type="string">
+			<column name="dtype" index="employeedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="salary" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`salary`"/>
+		</property>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+		<property name="hireDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`hiredate`"/>
+		</property>
+		<filter name="ageRange" condition="age between :fromAge and :toAge"/>
+		<filter name="salaryHigherThan" condition="salary > :salary"/>
+		<filter name="hireDate" condition="hireDate > :date"/>
+	</class>
+	<filter-def name="hireDate">
+		<filter-param name="date" type="date"/>
+	</filter-def>
+	<filter-def name="ageRange">
+		<filter-param name="fromAge" type="integer"/>
+		<filter-param name="toAge" type="integer"/>
+	</filter-def>
+	<filter-def name="salaryHigherThan">
+		<filter-param name="salary" type="integer"/>
+	</filter-def>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EmployeeAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EmployeeAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..783eb4170
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EmployeeAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,63 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.employee.impl.DepartmentImpl" entity-name="Department" abstract="false" lazy="false" table="`department`">
+		<meta attribute="eclassName" inherit="false">Department</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Employee</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="employees" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="department_employees">
+				<column name="`department_employees_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Employee"/>
+			<filter name="ageRange" condition="age between :fromAge and :toAge"/>
+			<filter name="salaryHigherThan" condition="salary > :salary"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.employee.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" table="`employee`">
+		<meta attribute="eclassName" inherit="false">Employee</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Employee</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="salary" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`salary`"/>
+		</property>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+		<property name="hireDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`hiredate`"/>
+		</property>
+		<filter name="ageRange" condition="age between :fromAge and :toAge"/>
+		<filter name="salaryHigherThan" condition="salary > :salary"/>
+		<filter name="hireDate" condition="hireDate > :date"/>
+	</class>
+	<filter-def name="hireDate">
+		<filter-param name="date" type="date"/>
+	</filter-def>
+	<filter-def name="ageRange">
+		<filter-param name="fromAge" type="integer"/>
+		<filter-param name="toAge" type="integer"/>
+	</filter-def>
+	<filter-def name="salaryHigherThan">
+		<filter-param name="salary" type="integer"/>
+	</filter-def>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EmployeeAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EmployeeAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..783eb4170
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EmployeeAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,63 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.employee.impl.DepartmentImpl" entity-name="Department" abstract="false" lazy="false" table="`department`">
+		<meta attribute="eclassName" inherit="false">Department</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Employee</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="employees" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="department_employees">
+				<column name="`department_employees_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Employee"/>
+			<filter name="ageRange" condition="age between :fromAge and :toAge"/>
+			<filter name="salaryHigherThan" condition="salary > :salary"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.employee.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" table="`employee`">
+		<meta attribute="eclassName" inherit="false">Employee</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Employee</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="salary" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`salary`"/>
+		</property>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+		<property name="hireDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`hiredate`"/>
+		</property>
+		<filter name="ageRange" condition="age between :fromAge and :toAge"/>
+		<filter name="salaryHigherThan" condition="salary > :salary"/>
+		<filter name="hireDate" condition="hireDate > :date"/>
+	</class>
+	<filter-def name="hireDate">
+		<filter-param name="date" type="date"/>
+	</filter-def>
+	<filter-def name="ageRange">
+		<filter-param name="fromAge" type="integer"/>
+		<filter-param name="toAge" type="integer"/>
+	</filter-def>
+	<filter-def name="salaryHigherThan">
+		<filter-param name="salary" type="integer"/>
+	</filter-def>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ExtendedPO2Test$1_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ExtendedPO2Test$1_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6665e7fc8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ExtendedPO2Test$1_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,209 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</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 type="string">
+			<column name="dtype" index="itemdtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="order" entity-name="PurchaseOrder" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="item_order" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`item_order_e_id`"/>
+		</many-to-one>
+		<property name="productName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`productname`"/>
+		</property>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`quantity`"/>
+		</property>
+		<property name="USPrice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`usprice`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`shipdate`"/>
+		</property>
+		<property name="partNum" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`partnum`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</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 type="string">
+			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`country`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`city`"/>
+		</property>
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`state`"/>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" discriminator-value="PurchaseOrder" table="`purchaseorder`">
+		<meta attribute="eclassName">PurchaseOrder</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</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 type="string">
+			<column name="dtype" index="purchaseorderdtype" length="255" not-null="true"/>
+		</discriminator>
+		<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" foreign-key="purchaseorder_items">
+				<column name="`item_order_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`purchaseorder_items_idx`"/>
+			<one-to-many entity-name="Item"/>
+		</list>
+		<many-to-one name="billTo" entity-name="Address" lazy="false" cascade="all" foreign-key="purchaseorder_billto" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`address_billto_e_id`"/>
+		</many-to-one>
+		<many-to-one name="shipTo" entity-name="Address" lazy="false" cascade="all" foreign-key="purchaseorder_shipto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_shipto_e_id`"/>
+		</many-to-one>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<property name="orderDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`orderdate`"/>
+		</property>
+		<property name="status" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`status`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.epo2.OrderStatus</param>
+				<param name="eclassifier">OrderStatus</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</param>
+			</type>
+		</property>
+		<many-to-one name="customer" entity-name="Customer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="purchaseorder_customer" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`purchaseorder_customer_e_id`"/>
+		</many-to-one>
+		<many-to-one name="previousOrder" entity-name="PurchaseOrder" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="purchaseorder_previousorder" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`purchaseorder_previousorder_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.SupplierImpl" entity-name="Supplier" abstract="false" lazy="false" discriminator-value="Supplier" table="`supplier`">
+		<meta attribute="eclassName">Supplier</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</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 type="string">
+			<column name="dtype" index="supplierdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="customers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="supplier_customers">
+				<column name="`supplier_customers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`supplier_customers_idx`"/>
+			<one-to-many entity-name="Customer"/>
+		</list>
+		<list name="orders" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="supplier_orders">
+				<column name="`supplier_orders_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`supplier_orders_idx`"/>
+			<one-to-many entity-name="PurchaseOrder"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" discriminator-value="Customer" table="`customer`">
+		<meta attribute="eclassName">Customer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</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 type="string">
+			<column name="dtype" index="customerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="customerID" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`customerid`"/>
+		</property>
+		<list name="orders" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`purchaseorder_customer_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`customer_orders_idx`"/>
+			<one-to-many entity-name="PurchaseOrder"/>
+		</list>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.GlobalAddressImpl" entity-name="GlobalAddress" abstract="false" lazy="false" extends="Address" discriminator-value="GlobalAddress">
+		<meta attribute="eclassName">GlobalAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<property name="countryCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`countrycode`"/>
+		</property>
+		<list name="location" table="`globaladdress_location`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`globaladdress_location_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`globaladdress_location_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.GlobalLocationImpl" entity-name="GlobalLocation" abstract="false" lazy="false" discriminator-value="GlobalLocation" table="`globallocation`">
+		<meta attribute="eclassName">GlobalLocation</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</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 type="string">
+			<column name="dtype" index="globallocationdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="countryCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`countrycode`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ExtendedPO2Test$1_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ExtendedPO2Test$1_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f3757ad06
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ExtendedPO2Test$1_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,197 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
+		<meta attribute="eclassName" inherit="false">Item</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="order" entity-name="PurchaseOrder" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="item_order" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`item_order_e_id`"/>
+		</many-to-one>
+		<property name="productName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`productname`"/>
+		</property>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`quantity`"/>
+		</property>
+		<property name="USPrice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`usprice`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`shipdate`"/>
+		</property>
+		<property name="partNum" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`partnum`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName" inherit="false">Address</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`country`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`">
+		<meta attribute="eclassName" inherit="false">USAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`city`"/>
+		</property>
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`state`"/>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`">
+		<meta attribute="eclassName" inherit="false">PurchaseOrder</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="items" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="purchaseorder_items">
+				<column name="`item_order_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`purchaseorder_items_idx`"/>
+			<one-to-many entity-name="Item"/>
+		</list>
+		<many-to-one name="billTo" entity-name="Address" lazy="false" cascade="all" foreign-key="purchaseorder_billto" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`address_billto_e_id`"/>
+		</many-to-one>
+		<many-to-one name="shipTo" entity-name="Address" lazy="false" cascade="all" foreign-key="purchaseorder_shipto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_shipto_e_id`"/>
+		</many-to-one>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<property name="orderDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`orderdate`"/>
+		</property>
+		<property name="status" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`status`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.epo2.OrderStatus</param>
+				<param name="eclassifier">OrderStatus</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</param>
+			</type>
+		</property>
+		<many-to-one name="customer" entity-name="Customer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="purchaseorder_customer" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`purchaseorder_customer_e_id`"/>
+		</many-to-one>
+		<many-to-one name="previousOrder" entity-name="PurchaseOrder" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="purchaseorder_previousorder" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`purchaseorder_previousorder_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.SupplierImpl" entity-name="Supplier" abstract="false" lazy="false" table="`supplier`">
+		<meta attribute="eclassName" inherit="false">Supplier</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="customers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="supplier_customers">
+				<column name="`supplier_customers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`supplier_customers_idx`"/>
+			<one-to-many entity-name="Customer"/>
+		</list>
+		<list name="orders" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="supplier_orders">
+				<column name="`supplier_orders_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`supplier_orders_idx`"/>
+			<one-to-many entity-name="PurchaseOrder"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
+		<meta attribute="eclassName" inherit="false">Customer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="customerID" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`customerid`"/>
+		</property>
+		<list name="orders" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`purchaseorder_customer_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`customer_orders_idx`"/>
+			<one-to-many entity-name="PurchaseOrder"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.GlobalAddressImpl" entity-name="GlobalAddress" abstract="false" lazy="false" extends="Address" table="`globaladdress`">
+		<meta attribute="eclassName" inherit="false">GlobalAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="countryCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`countrycode`"/>
+		</property>
+		<list name="location" table="`globaladdress_location`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`globaladdress_location_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`globaladdress_location_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.GlobalLocationImpl" entity-name="GlobalLocation" abstract="false" lazy="false" table="`globallocation`">
+		<meta attribute="eclassName" inherit="false">GlobalLocation</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="countryCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`countrycode`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ExtendedPO2Test$1_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ExtendedPO2Test$1_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f3757ad06
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ExtendedPO2Test$1_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,197 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
+		<meta attribute="eclassName" inherit="false">Item</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="order" entity-name="PurchaseOrder" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="item_order" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`item_order_e_id`"/>
+		</many-to-one>
+		<property name="productName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`productname`"/>
+		</property>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`quantity`"/>
+		</property>
+		<property name="USPrice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`usprice`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`shipdate`"/>
+		</property>
+		<property name="partNum" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`partnum`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName" inherit="false">Address</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`country`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`">
+		<meta attribute="eclassName" inherit="false">USAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`city`"/>
+		</property>
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`state`"/>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`">
+		<meta attribute="eclassName" inherit="false">PurchaseOrder</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="items" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="purchaseorder_items">
+				<column name="`item_order_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`purchaseorder_items_idx`"/>
+			<one-to-many entity-name="Item"/>
+		</list>
+		<many-to-one name="billTo" entity-name="Address" lazy="false" cascade="all" foreign-key="purchaseorder_billto" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`address_billto_e_id`"/>
+		</many-to-one>
+		<many-to-one name="shipTo" entity-name="Address" lazy="false" cascade="all" foreign-key="purchaseorder_shipto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_shipto_e_id`"/>
+		</many-to-one>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<property name="orderDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`orderdate`"/>
+		</property>
+		<property name="status" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`status`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.epo2.OrderStatus</param>
+				<param name="eclassifier">OrderStatus</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</param>
+			</type>
+		</property>
+		<many-to-one name="customer" entity-name="Customer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="purchaseorder_customer" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`purchaseorder_customer_e_id`"/>
+		</many-to-one>
+		<many-to-one name="previousOrder" entity-name="PurchaseOrder" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="purchaseorder_previousorder" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`purchaseorder_previousorder_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.SupplierImpl" entity-name="Supplier" abstract="false" lazy="false" table="`supplier`">
+		<meta attribute="eclassName" inherit="false">Supplier</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="customers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="supplier_customers">
+				<column name="`supplier_customers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`supplier_customers_idx`"/>
+			<one-to-many entity-name="Customer"/>
+		</list>
+		<list name="orders" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="supplier_orders">
+				<column name="`supplier_orders_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`supplier_orders_idx`"/>
+			<one-to-many entity-name="PurchaseOrder"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
+		<meta attribute="eclassName" inherit="false">Customer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="customerID" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`customerid`"/>
+		</property>
+		<list name="orders" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`purchaseorder_customer_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`customer_orders_idx`"/>
+			<one-to-many entity-name="PurchaseOrder"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.GlobalAddressImpl" entity-name="GlobalAddress" abstract="false" lazy="false" extends="Address" table="`globaladdress`">
+		<meta attribute="eclassName" inherit="false">GlobalAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="countryCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`countrycode`"/>
+		</property>
+		<list name="location" table="`globaladdress_location`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`globaladdress_location_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`globaladdress_location_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.epo2.impl.GlobalLocationImpl" entity-name="GlobalLocation" abstract="false" lazy="false" table="`globallocation`">
+		<meta attribute="eclassName" inherit="false">GlobalLocation</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/extendedpo2</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="countryCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`countrycode`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/FleetEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/FleetEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..33f9abfc3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/FleetEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,22 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass entity-name="Vehicle" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Vehicle"/>
+	<subclass entity-name="Temporal" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Temporal"/>
+	<subclass entity-name="Person" abstract="false" lazy="false" extends="Temporal" discriminator-value="Person"/>
+	<subclass entity-name="Address" abstract="false" lazy="false" extends="Temporal" discriminator-value="Address"/>
+	<subclass entity-name="VehicleInfo" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="VehicleInfo"/>
+	<subclass entity-name="ManufacturingPlant" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ManufacturingPlant"/>
+	<subclass entity-name="Fleet" abstract="false" lazy="false" extends="Temporal" discriminator-value="Fleet"/>
+	<subclass entity-name="Garage" abstract="false" lazy="false" extends="Temporal" discriminator-value="Garage"/>
+	<subclass entity-name="Tire" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Tire"/>
+	<subclass entity-name="Car" abstract="false" lazy="false" extends="Vehicle" discriminator-value="Car"/>
+	<subclass entity-name="Hybrid" abstract="false" lazy="false" extends="Car" discriminator-value="Hybrid"/>
+	<subclass name="fleet.PassengerVehicle" entity-name="PassengerVehicle" abstract="true" lazy="false" extends="EAV_EObject" discriminator-value="PassengerVehicle"/>
+	<subclass entity-name="EngineFactory" abstract="false" lazy="false" extends="ManufacturingPlant" discriminator-value="EngineFactory"/>
+	<subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress"/>
+	<subclass entity-name="Vin" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Vin"/>
+	<subclass entity-name="TransportationDevice" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TransportationDevice"/>
+	<subclass entity-name="VersionHolder" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="VersionHolder"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/FleetEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/FleetEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..33f9abfc3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/FleetEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,22 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass entity-name="Vehicle" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Vehicle"/>
+	<subclass entity-name="Temporal" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Temporal"/>
+	<subclass entity-name="Person" abstract="false" lazy="false" extends="Temporal" discriminator-value="Person"/>
+	<subclass entity-name="Address" abstract="false" lazy="false" extends="Temporal" discriminator-value="Address"/>
+	<subclass entity-name="VehicleInfo" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="VehicleInfo"/>
+	<subclass entity-name="ManufacturingPlant" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ManufacturingPlant"/>
+	<subclass entity-name="Fleet" abstract="false" lazy="false" extends="Temporal" discriminator-value="Fleet"/>
+	<subclass entity-name="Garage" abstract="false" lazy="false" extends="Temporal" discriminator-value="Garage"/>
+	<subclass entity-name="Tire" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Tire"/>
+	<subclass entity-name="Car" abstract="false" lazy="false" extends="Vehicle" discriminator-value="Car"/>
+	<subclass entity-name="Hybrid" abstract="false" lazy="false" extends="Car" discriminator-value="Hybrid"/>
+	<subclass name="fleet.PassengerVehicle" entity-name="PassengerVehicle" abstract="true" lazy="false" extends="EAV_EObject" discriminator-value="PassengerVehicle"/>
+	<subclass entity-name="EngineFactory" abstract="false" lazy="false" extends="ManufacturingPlant" discriminator-value="EngineFactory"/>
+	<subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress"/>
+	<subclass entity-name="Vin" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Vin"/>
+	<subclass entity-name="TransportationDevice" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TransportationDevice"/>
+	<subclass entity-name="VersionHolder" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="VersionHolder"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/FleetEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/FleetEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..33f9abfc3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/FleetEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,22 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass entity-name="Vehicle" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Vehicle"/>
+	<subclass entity-name="Temporal" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Temporal"/>
+	<subclass entity-name="Person" abstract="false" lazy="false" extends="Temporal" discriminator-value="Person"/>
+	<subclass entity-name="Address" abstract="false" lazy="false" extends="Temporal" discriminator-value="Address"/>
+	<subclass entity-name="VehicleInfo" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="VehicleInfo"/>
+	<subclass entity-name="ManufacturingPlant" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ManufacturingPlant"/>
+	<subclass entity-name="Fleet" abstract="false" lazy="false" extends="Temporal" discriminator-value="Fleet"/>
+	<subclass entity-name="Garage" abstract="false" lazy="false" extends="Temporal" discriminator-value="Garage"/>
+	<subclass entity-name="Tire" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Tire"/>
+	<subclass entity-name="Car" abstract="false" lazy="false" extends="Vehicle" discriminator-value="Car"/>
+	<subclass entity-name="Hybrid" abstract="false" lazy="false" extends="Car" discriminator-value="Hybrid"/>
+	<subclass name="fleet.PassengerVehicle" entity-name="PassengerVehicle" abstract="true" lazy="false" extends="EAV_EObject" discriminator-value="PassengerVehicle"/>
+	<subclass entity-name="EngineFactory" abstract="false" lazy="false" extends="ManufacturingPlant" discriminator-value="EngineFactory"/>
+	<subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress"/>
+	<subclass entity-name="Vin" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Vin"/>
+	<subclass entity-name="TransportationDevice" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TransportationDevice"/>
+	<subclass entity-name="VersionHolder" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="VersionHolder"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVAction_hsqldb_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9fd4372a1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVAction_hsqldb_e_o_hibernate.hbm.xml
@@ -0,0 +1,12 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Library"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVAction_hsqldb_h_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9fd4372a1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVAction_hsqldb_h_o_hibernate.hbm.xml
@@ -0,0 +1,12 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Library"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9fd4372a1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,12 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Library"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9fd4372a1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,12 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Library"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVExtraLazyAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVExtraLazyAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a7d28fa50
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVExtraLazyAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,12 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Book" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Library" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Library"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Writer" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVExtraLazyAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVExtraLazyAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a7d28fa50
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVExtraLazyAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,12 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Book" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Library" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Library"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Writer" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVHbResourceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVHbResourceAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a7d28fa50
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVHbResourceAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,12 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Book" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Library" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Library"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Writer" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVHbResourceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVHbResourceAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a7d28fa50
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVHbResourceAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,12 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Book" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Library" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Library"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Writer" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVHbResourceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVHbResourceAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a7d28fa50
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVHbResourceAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,12 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Book" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Library" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Library"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Writer" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVResourceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVResourceAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a7d28fa50
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVResourceAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,12 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Book" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Library" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Library"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Writer" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVResourceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVResourceAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a7d28fa50
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVResourceAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,12 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Book" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Library" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Library"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Writer" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVResourceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVResourceAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a7d28fa50
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryEAVResourceAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,12 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Book" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Library" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Library"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" extends="EAV_EObject" discriminator-value="Writer" proxy="org.eclipse.emf.teneo.samples.emf.sample.library.Writer"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..3214df280
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b1c27f81a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8f53374fc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+		<join table="`writer_book`" inverse="false" optional="true">
+			<key update="true">
+				<column name="`book_title`" not-null="true" unique="false"/>
+			</key>
+			<many-to-one name="author" entity-name="Writer" lazy="false" insert="true" update="true" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author">
+				<column not-null="false" unique="false" name="`writer_e_id`"/>
+			</many-to-one>
+		</join>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" inverse="true" table="`writer_book`" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<many-to-many entity-name="Book" unique="true">
+				<column name="`book_title`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8f53374fc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+		<join table="`writer_book`" inverse="false" optional="true">
+			<key update="true">
+				<column name="`book_title`" not-null="true" unique="false"/>
+			</key>
+			<many-to-one name="author" entity-name="Writer" lazy="false" insert="true" update="true" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author">
+				<column not-null="false" unique="false" name="`writer_e_id`"/>
+			</many-to-one>
+		</join>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" inverse="true" table="`writer_book`" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<many-to-many entity-name="Book" unique="true">
+				<column name="`book_title`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyMoreAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyMoreAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..3214df280
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyMoreAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyMoreAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyMoreAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b1c27f81a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyMoreAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryHbResourceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryHbResourceAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..77d7ec7e0
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryHbResourceAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" lazy="false" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryHbResourceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryHbResourceAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f6d6ebece
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryHbResourceAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,84 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" lazy="false" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryHbResourceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryHbResourceAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f6d6ebece
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryHbResourceAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,84 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" lazy="false" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryInterfaceQueryTest_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryInterfaceQueryTest_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b7fe585fb
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryInterfaceQueryTest_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,98 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Book" abstract="false" lazy="false" discriminator-value="org.eclipse.emf.teneo.samples.emf.sample.library.Book" table="`org_eclipse_emf_teneo_samples_emf_sample_library_book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="org_eclipse_emf_teneo_samples_emf_sample_library_bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="org_eclipse_emf_teneo_samples_emf_sample_library_book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Library" abstract="false" lazy="false" discriminator-value="org.eclipse.emf.teneo.samples.emf.sample.library.Library" table="`org_eclipse_emf_teneo_samples_emf_sample_library_library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="org_eclipse_emf_teneo_samples_emf_sample_library_librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="org_eclipse_emf_teneo_samples_emf_sample_library_library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Writer" abstract="false" lazy="false" discriminator-value="org.eclipse.emf.teneo.samples.emf.sample.library.Writer" table="`org_eclipse_emf_teneo_samples_emf_sample_library_writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="org_eclipse_emf_teneo_samples_emf_sample_library_writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryInterfaceQueryTest_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryInterfaceQueryTest_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..bb1857bd8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryInterfaceQueryTest_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,91 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Book" abstract="false" lazy="false" table="`org_eclipse_emf_teneo_samples_emf_sample_library_book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="org_eclipse_emf_teneo_samples_emf_sample_library_book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Library" abstract="false" lazy="false" table="`org_eclipse_emf_teneo_samples_emf_sample_library_library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="org_eclipse_emf_teneo_samples_emf_sample_library_library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Writer" abstract="false" lazy="false" table="`org_eclipse_emf_teneo_samples_emf_sample_library_writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryInterfaceQueryTest_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryInterfaceQueryTest_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4673066c5
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryInterfaceQueryTest_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,89 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Book" abstract="false" lazy="false" table="`org_eclipse_emf_teneo_samples_emf_sample_library_book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="org_eclipse_emf_teneo_samples_emf_sample_library_book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Library" abstract="false" lazy="false" table="`org_eclipse_emf_teneo_samples_emf_sample_library_library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="org_eclipse_emf_teneo_samples_emf_sample_library_library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Writer" abstract="false" lazy="false" table="`org_eclipse_emf_teneo_samples_emf_sample_library_writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c8ecc0539
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7aa6cdb03
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d4e470760
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAddContentAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAddContentAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c8ecc0539
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAddContentAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAddContentAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAddContentAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7aa6cdb03
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAddContentAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAddContentAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAddContentAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d4e470760
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAddContentAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_hsqldb_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..73e472a7f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_hsqldb_e_o_hibernate.hbm.xml
@@ -0,0 +1,91 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" table="`tab_book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`col_title`" length="50"/>
+		</id>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`col_pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`col_category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="FKPRE_book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`col_book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`col_test`"/>
+		</property>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" table="`tab_library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="`col_library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="FKPRE_library_books">
+				<column name="`col_library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`col_library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" table="`tab_writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`col_book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`col_writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_hsqldb_h_o_hibernate.hbm.xml
new file mode 100755
index 000000000..eb31161bb
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_hsqldb_h_o_hibernate.hbm.xml
@@ -0,0 +1,100 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`tab_book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`col_title`" length="50"/>
+		</id>
+		<discriminator type="string">
+			<column name="COL_dtype" index="TAB_bookCOL_dtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`col_pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`col_category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="FKPRE_book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`col_book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`col_test`"/>
+		</property>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`tab_library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="COL_dtype" index="TAB_libraryCOL_dtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="`col_library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="FKPRE_library_books">
+				<column name="`col_library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`col_library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`tab_writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="COL_dtype" index="TAB_writerCOL_dtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`col_book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`col_writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e882940e4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,100 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`tab_book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`col_title`" length="50"/>
+		</id>
+		<discriminator type="string">
+			<column name="COL_dtype" index="TAB_bookCOL_dtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`col_pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`col_category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="FKPRE_book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`col_book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`col_test`"/>
+		</property>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`tab_library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="COL_dtype" index="TAB_libraryCOL_dtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="`col_library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="FKPRE_library_books">
+				<column name="`col_library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`col_library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`tab_writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="COL_dtype" index="TAB_writerCOL_dtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`col_book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`col_writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0b8b5156c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<import class="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" rename="Book"/>
+	<import class="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" rename="Library"/>
+	<import class="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" rename="Writer"/>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" abstract="false" lazy="false" table="`tab_book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`col_title`" length="50"/>
+		</id>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`col_pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`col_category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" class="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="FKPRE_book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`col_book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`col_test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" abstract="false" lazy="false" table="`tab_library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="`col_library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many class="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="FKPRE_library_books">
+				<column name="`col_library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`col_library_books_idx`"/>
+			<one-to-many class="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" abstract="false" lazy="false" table="`tab_writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`col_book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`col_writer_books_idx`"/>
+			<one-to-many class="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..73e472a7f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,91 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" table="`tab_book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`col_title`" length="50"/>
+		</id>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`col_pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`col_category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="FKPRE_book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`col_book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`col_test`"/>
+		</property>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" table="`tab_library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="`col_library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="FKPRE_library_books">
+				<column name="`col_library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`col_library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" table="`tab_writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`col_book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`col_writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryValidateResourceTest$1_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryValidateResourceTest$1_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c8ecc0539
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryValidateResourceTest$1_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryValidateResourceTest$1_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryValidateResourceTest$1_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7aa6cdb03
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryValidateResourceTest$1_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryValidateResourceTest$1_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryValidateResourceTest$1_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d4e470760
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryValidateResourceTest$1_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ProductEAVTest_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ProductEAVTest_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8e340cbb0
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ProductEAVTest_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,8 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ProductType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.SupplierTypeImpl" entity-name="SupplierType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SupplierType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ClassificationTypeImpl" entity-name="ClassificationType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ClassificationType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ProductEAVTest_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ProductEAVTest_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8e340cbb0
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ProductEAVTest_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,8 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ProductType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.SupplierTypeImpl" entity-name="SupplierType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SupplierType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ClassificationTypeImpl" entity-name="ClassificationType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ClassificationType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ProductEAVTest_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ProductEAVTest_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8e340cbb0
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ProductEAVTest_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,8 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ProductType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.SupplierTypeImpl" entity-name="SupplierType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SupplierType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ClassificationTypeImpl" entity-name="ClassificationType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ClassificationType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/SchoolLibraryTest$1_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/SchoolLibraryTest$1_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d268a8bd2
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/SchoolLibraryTest$1_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,129 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http:///org/elver/store/test/emf/sample/schoollibrary/library.ecore</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http:///org/elver/store/test/emf/sample/schoollibrary/library.ecore</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http:///org/elver/store/test/emf/sample/schoollibrary/library.ecore</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http:///org/elver/store/test/emf/sample/schoollibrary/library.ecore</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.impl.AssetImpl" entity-name="Asset" abstract="false" lazy="false" discriminator-value="Asset" table="`asset`">
+		<meta attribute="eclassName">Asset</meta>
+		<meta attribute="epackage">http:///org/elver/store/test/emf/sample/schoollibrary/schoollibrary.ecore</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="dtype" index="assetdtype" length="255" not-null="true"/>
+		</discriminator>
+		<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" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.impl.SchoolBookImpl" entity-name="SchoolBook" abstract="false" lazy="false" extends="Book" discriminator-value="SchoolBook">
+		<meta attribute="eclassName">SchoolBook</meta>
+		<meta attribute="epackage">http:///org/elver/store/test/emf/sample/schoollibrary/schoollibrary.ecore</meta>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.impl.SchoolLibraryImpl" entity-name="SchoolLibrary" abstract="false" lazy="false" extends="Library" discriminator-value="SchoolLibrary">
+		<meta attribute="eclassName">SchoolLibrary</meta>
+		<meta attribute="epackage">http:///org/elver/store/test/emf/sample/schoollibrary/schoollibrary.ecore</meta>
+		<property name="location" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`location`"/>
+		</property>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/SchoolLibraryTest$1_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/SchoolLibraryTest$1_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7c6df17a4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/SchoolLibraryTest$1_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,123 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/emf/sample/schoollibrary/library.ecore</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http:///org/elver/store/test/emf/sample/schoollibrary/library.ecore</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/emf/sample/schoollibrary/library.ecore</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/emf/sample/schoollibrary/library.ecore</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.impl.AssetImpl" entity-name="Asset" abstract="false" lazy="false" table="`asset`">
+		<meta attribute="eclassName" inherit="false">Asset</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/emf/sample/schoollibrary/schoollibrary.ecore</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.impl.SchoolBookImpl" entity-name="SchoolBook" abstract="false" lazy="false" extends="Book" table="`schoolbook`">
+		<meta attribute="eclassName" inherit="false">SchoolBook</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/emf/sample/schoollibrary/schoollibrary.ecore</meta>
+		<key>
+			<column name="`book_e_id`"/>
+		</key>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.impl.SchoolLibraryImpl" entity-name="SchoolLibrary" abstract="false" lazy="false" extends="Library" table="`schoollibrary`">
+		<meta attribute="eclassName" inherit="false">SchoolLibrary</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/emf/sample/schoollibrary/schoollibrary.ecore</meta>
+		<key>
+			<column name="`library_e_id`"/>
+		</key>
+		<property name="location" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`location`"/>
+		</property>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/SchoolLibraryTest$1_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/SchoolLibraryTest$1_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7c6df17a4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/SchoolLibraryTest$1_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,123 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/emf/sample/schoollibrary/library.ecore</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http:///org/elver/store/test/emf/sample/schoollibrary/library.ecore</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/emf/sample/schoollibrary/library.ecore</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/emf/sample/schoollibrary/library.ecore</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.impl.AssetImpl" entity-name="Asset" abstract="false" lazy="false" table="`asset`">
+		<meta attribute="eclassName" inherit="false">Asset</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/emf/sample/schoollibrary/schoollibrary.ecore</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.impl.SchoolBookImpl" entity-name="SchoolBook" abstract="false" lazy="false" extends="Book" table="`schoolbook`">
+		<meta attribute="eclassName" inherit="false">SchoolBook</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/emf/sample/schoollibrary/schoollibrary.ecore</meta>
+		<key>
+			<column name="`book_e_id`"/>
+		</key>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.impl.SchoolLibraryImpl" entity-name="SchoolLibrary" abstract="false" lazy="false" extends="Library" table="`schoollibrary`">
+		<meta attribute="eclassName" inherit="false">SchoolLibrary</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/emf/sample/schoollibrary/schoollibrary.ecore</meta>
+		<key>
+			<column name="`library_e_id`"/>
+		</key>
+		<property name="location" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`location`"/>
+		</property>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestDoubleEAV_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestDoubleEAV_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..951a35fe4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestDoubleEAV_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass entity-name="TestType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TestType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestDoubleEAV_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestDoubleEAV_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..951a35fe4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestDoubleEAV_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass entity-name="TestType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TestType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestDoubleEAV_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestDoubleEAV_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..951a35fe4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestDoubleEAV_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass entity-name="TestType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TestType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestLazyUtilsAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestLazyUtilsAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7aa6cdb03
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestLazyUtilsAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestLazyUtilsAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestLazyUtilsAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d4e470760
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestLazyUtilsAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction$1_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction$1_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..991359fcb
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction$1_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.AImpl" entity-name="A" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="A"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.RImpl" entity-name="R" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="R"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction$1_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction$1_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..991359fcb
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction$1_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.AImpl" entity-name="A" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="A"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.RImpl" entity-name="R" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="R"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction$1_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction$1_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..991359fcb
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction$1_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.AImpl" entity-name="A" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="A"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.RImpl" entity-name="R" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="R"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..91eadcf37
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl.TestDateImpl" entity-name="TestDate" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TestDate"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..91eadcf37
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl.TestDateImpl" entity-name="TestDate" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TestDate"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..91eadcf37
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl.TestDateImpl" entity-name="TestDate" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TestDate"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesTest$1_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesTest$1_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..106e473f8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesTest$1_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,53 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.AImpl" entity-name="A" abstract="false" lazy="false" discriminator-value="A" table="`a`">
+		<meta attribute="eclassName">A</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/attributes</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="adtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="b" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`b`"/>
+		</property>
+		<property name="c" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`c`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<property name="d" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`d`"/>
+		</property>
+		<many-to-one name="myR" entity-name="R" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="a_myr" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`r_myr_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.RImpl" entity-name="R" abstract="false" lazy="false" discriminator-value="R" table="`r`">
+		<meta attribute="eclassName">R</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/attributes</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 type="string">
+			<column name="dtype" index="rdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesTest$1_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesTest$1_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4b66e0363
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesTest$1_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,47 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.AImpl" entity-name="A" abstract="false" lazy="false" table="`a`">
+		<meta attribute="eclassName">A</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/attributes</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="b" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`b`"/>
+		</property>
+		<property name="c" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`c`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<property name="d" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`d`"/>
+		</property>
+		<many-to-one name="myR" entity-name="R" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="a_myr" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`r_myr_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.RImpl" entity-name="R" abstract="false" lazy="false" table="`r`">
+		<meta attribute="eclassName">R</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/attributes</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesTest$1_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesTest$1_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4b66e0363
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/AttributesTest$1_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,47 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.AImpl" entity-name="A" abstract="false" lazy="false" table="`a`">
+		<meta attribute="eclassName">A</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/attributes</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="b" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`b`"/>
+		</property>
+		<property name="c" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`c`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<property name="d" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`d`"/>
+		</property>
+		<many-to-one name="myR" entity-name="R" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="a_myr" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`r_myr_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl.RImpl" entity-name="R" abstract="false" lazy="false" table="`r`">
+		<meta attribute="eclassName">R</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/attributes</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DateTimeEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DateTimeEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..91eadcf37
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DateTimeEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl.TestDateImpl" entity-name="TestDate" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TestDate"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DateTimeEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DateTimeEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..91eadcf37
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DateTimeEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl.TestDateImpl" entity-name="TestDate" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TestDate"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DateTimeEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DateTimeEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..91eadcf37
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DateTimeEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl.TestDateImpl" entity-name="TestDate" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="TestDate"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DocumentRootEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DocumentRootEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..bcee22112
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DocumentRootEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.ComplexTypeImpl" entity-name="ComplexType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ComplexType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.DocumentRootImpl" entity-name="documentroot.DocumentRoot" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="documentroot.DocumentRoot"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DocumentRootEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DocumentRootEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..bcee22112
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DocumentRootEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.ComplexTypeImpl" entity-name="ComplexType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ComplexType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.DocumentRootImpl" entity-name="documentroot.DocumentRoot" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="documentroot.DocumentRoot"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DocumentRootEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DocumentRootEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..bcee22112
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/DocumentRootEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.ComplexTypeImpl" entity-name="ComplexType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ComplexType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.DocumentRootImpl" entity-name="documentroot.DocumentRoot" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="documentroot.DocumentRoot"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..70d20ce12
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,71 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<map name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_writers">
+				<column name="`book_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<one-to-many entity-name="Writer"/>
+		</map>
+		<map name="keyWords" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`book_keywords_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<map name="cityByWriter" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`book_citybywriter_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key-many-to-many entity-name="Writer"/>
+			<element type="java.lang.String"/>
+		</map>
+		<map name="categoryByDate" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`book_categorybydate_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="timestamp"/>
+			<element>
+				<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+					<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
+					<param name="eclassifier">Category</param>
+					<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+				</type>
+			</element>
+		</map>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..267bf7c8b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,138 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_writers">
+				<column name="`book_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_writers_idx`"/>
+			<one-to-many entity-name="StringToWriterMapEntry"/>
+		</list>
+		<list name="keyWords" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_keywords">
+				<column name="`book_keywords_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_keywords_idx`"/>
+			<one-to-many entity-name="StringToStringMapEntry"/>
+		</list>
+		<list name="cityByWriter" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_citybywriter">
+				<column name="`book_citybywriter_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_citybywriter_idx`"/>
+			<one-to-many entity-name="WriterToStringMapEntry"/>
+		</list>
+		<list name="categoryByDate" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_categorybydate">
+				<column name="`book_categorybydate_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_categorybydate_idx`"/>
+			<one-to-many entity-name="DateToCategoryMapEntry"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.DateToCategoryMapEntryImpl" entity-name="DateToCategoryMapEntry" abstract="false" lazy="false" table="`datetocategorymapentry`">
+		<meta attribute="eclassName">DateToCategoryMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`key`"/>
+		</property>
+		<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.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
+				<param name="eclassifier">Category</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+			</type>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToStringMapEntryImpl" entity-name="StringToStringMapEntry" abstract="false" lazy="false" table="`stringtostringmapentry`">
+		<meta attribute="eclassName">StringToStringMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="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>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" table="`stringtowritermapentry`">
+		<meta attribute="eclassName">StringToWriterMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`key`"/>
+		</property>
+		<many-to-one name="value" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="stringtowritermapentry_value" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`writer_value_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" table="`writertostringmapentry`">
+		<meta attribute="eclassName">WriterToStringMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="key" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="writertostringmapentry_key" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`writer_key_e_id`"/>
+		</many-to-one>
+		<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>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..99acf4b15
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,15 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.DateToCategoryMapEntryImpl" entity-name="DateToCategoryMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="DateToCategoryMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToStringMapEntryImpl" entity-name="StringToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToStringMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToWriterMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="WriterToStringMapEntry"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..99acf4b15
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,15 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.DateToCategoryMapEntryImpl" entity-name="DateToCategoryMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="DateToCategoryMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToStringMapEntryImpl" entity-name="StringToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToStringMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToWriterMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="WriterToStringMapEntry"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..99acf4b15
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,15 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.DateToCategoryMapEntryImpl" entity-name="DateToCategoryMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="DateToCategoryMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToStringMapEntryImpl" entity-name="StringToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToStringMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToWriterMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="WriterToStringMapEntry"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..30465629d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,138 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<list name="writers" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_writers">
+				<column name="`book_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_writers_idx`"/>
+			<one-to-many entity-name="StringToWriterMapEntry"/>
+		</list>
+		<list name="keyWords" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_keywords">
+				<column name="`book_keywords_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_keywords_idx`"/>
+			<one-to-many entity-name="StringToStringMapEntry"/>
+		</list>
+		<list name="cityByWriter" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_citybywriter">
+				<column name="`book_citybywriter_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_citybywriter_idx`"/>
+			<one-to-many entity-name="WriterToStringMapEntry"/>
+		</list>
+		<list name="categoryByDate" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_categorybydate">
+				<column name="`book_categorybydate_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_categorybydate_idx`"/>
+			<one-to-many entity-name="DateToCategoryMapEntry"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.DateToCategoryMapEntryImpl" entity-name="DateToCategoryMapEntry" abstract="false" lazy="false" table="`datetocategorymapentry`">
+		<meta attribute="eclassName">DateToCategoryMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`key`"/>
+		</property>
+		<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.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
+				<param name="eclassifier">Category</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+			</type>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToStringMapEntryImpl" entity-name="StringToStringMapEntry" abstract="false" lazy="false" table="`stringtostringmapentry`">
+		<meta attribute="eclassName">StringToStringMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="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>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" table="`stringtowritermapentry`">
+		<meta attribute="eclassName">StringToWriterMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`key`"/>
+		</property>
+		<many-to-one name="value" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="stringtowritermapentry_value" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`writer_value_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" table="`writertostringmapentry`">
+		<meta attribute="eclassName">WriterToStringMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="key" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="writertostringmapentry_key" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`writer_key_e_id`"/>
+		</many-to-one>
+		<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>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..99acf4b15
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,15 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.DateToCategoryMapEntryImpl" entity-name="DateToCategoryMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="DateToCategoryMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToStringMapEntryImpl" entity-name="StringToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToStringMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToWriterMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="WriterToStringMapEntry"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..99acf4b15
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,15 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.DateToCategoryMapEntryImpl" entity-name="DateToCategoryMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="DateToCategoryMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToStringMapEntryImpl" entity-name="StringToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToStringMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToWriterMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="WriterToStringMapEntry"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..99acf4b15
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,15 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.DateToCategoryMapEntryImpl" entity-name="DateToCategoryMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="DateToCategoryMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToStringMapEntryImpl" entity-name="StringToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToStringMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToWriterMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="WriterToStringMapEntry"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..99acf4b15
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,15 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Book"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.DateToCategoryMapEntryImpl" entity-name="DateToCategoryMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="DateToCategoryMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToStringMapEntryImpl" entity-name="StringToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToStringMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="StringToWriterMapEntry"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Writer"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="WriterToStringMapEntry"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EcoreAttrsEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EcoreAttrsEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f6a64e7f1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EcoreAttrsEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,9 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Element"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.FeatureImpl" entity-name="Feature" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Feature"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.MixedImpl" entity-name="Mixed" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Mixed"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.NameListImpl" entity-name="NameList" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="NameList"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EcoreAttrsEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EcoreAttrsEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f6a64e7f1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EcoreAttrsEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,9 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Element"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.FeatureImpl" entity-name="Feature" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Feature"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.MixedImpl" entity-name="Mixed" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Mixed"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.NameListImpl" entity-name="NameList" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="NameList"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EcoreAttrsEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EcoreAttrsEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f6a64e7f1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EcoreAttrsEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,9 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Element"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.FeatureImpl" entity-name="Feature" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Feature"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.MixedImpl" entity-name="Mixed" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Mixed"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.NameListImpl" entity-name="NameList" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="NameList"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ExtensionEAVAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ExtensionEAVAction_hsqldb_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..033d3d2a5
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ExtensionEAVAction_hsqldb_e_o_hibernate.hbm.xml
@@ -0,0 +1,16 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" extends="EAV_EObject" discriminator-value="Address"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="AddressList"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" discriminator-value="UKAddress"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" discriminator-value="DistrictUKAddress"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl" entity-name="FirstAddressHolder" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="FirstAddressHolder"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="InternationalPrice"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ExtensionEAVAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ExtensionEAVAction_hsqldb_h_o_hibernate.hbm.xml
new file mode 100755
index 000000000..033d3d2a5
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ExtensionEAVAction_hsqldb_h_o_hibernate.hbm.xml
@@ -0,0 +1,16 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" extends="EAV_EObject" discriminator-value="Address"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="AddressList"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" discriminator-value="UKAddress"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" discriminator-value="DistrictUKAddress"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl" entity-name="FirstAddressHolder" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="FirstAddressHolder"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="InternationalPrice"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ExtensionEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ExtensionEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..033d3d2a5
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ExtensionEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,16 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" extends="EAV_EObject" discriminator-value="Address"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="AddressList"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" discriminator-value="UKAddress"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" discriminator-value="DistrictUKAddress"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl" entity-name="FirstAddressHolder" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="FirstAddressHolder"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="InternationalPrice"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ExtensionEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ExtensionEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..033d3d2a5
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ExtensionEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,16 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" extends="EAV_EObject" discriminator-value="Address"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="AddressList"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" discriminator-value="UKAddress"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" discriminator-value="DistrictUKAddress"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl" entity-name="FirstAddressHolder" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="FirstAddressHolder"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="InternationalPrice"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ExtensionEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ExtensionEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..033d3d2a5
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ExtensionEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,16 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" extends="EAV_EObject" discriminator-value="Address"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="AddressList"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" discriminator-value="UKAddress"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" discriminator-value="DistrictUKAddress"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl" entity-name="FirstAddressHolder" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="FirstAddressHolder"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="InternationalPrice"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/GroupEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/GroupEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ffb08e2d4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/GroupEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,10 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Address"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressGroupImpl" entity-name="AddressGroup" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="AddressGroup"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="AddressList"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllMapTypeImpl" entity-name="SimpleAllMapType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleAllMapType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllTypeImpl" entity-name="SimpleAllType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleAllType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/GroupEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/GroupEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ffb08e2d4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/GroupEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,10 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Address"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressGroupImpl" entity-name="AddressGroup" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="AddressGroup"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="AddressList"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllMapTypeImpl" entity-name="SimpleAllMapType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleAllMapType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllTypeImpl" entity-name="SimpleAllType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleAllType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/GroupEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/GroupEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ffb08e2d4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/GroupEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,10 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Address"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressGroupImpl" entity-name="AddressGroup" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="AddressGroup"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="AddressList"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllMapTypeImpl" entity-name="SimpleAllMapType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleAllMapType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllTypeImpl" entity-name="SimpleAllType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleAllType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ListEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ListEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..68381f100
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ListEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,18 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="list.SixStatesList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">SixStatesList</param>
+	</typedef>
+	<typedef name="list.StateList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">StateList</param>
+	</typedef>
+	<typedef name="list.StringList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">StringList</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl.statesByCountryImpl" entity-name="statesByCountry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="statesByCountry"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ListEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ListEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..68381f100
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ListEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,18 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="list.SixStatesList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">SixStatesList</param>
+	</typedef>
+	<typedef name="list.StateList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">StateList</param>
+	</typedef>
+	<typedef name="list.StringList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">StringList</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl.statesByCountryImpl" entity-name="statesByCountry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="statesByCountry"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ListEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ListEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..68381f100
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/ListEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,18 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="list.SixStatesList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">SixStatesList</param>
+	</typedef>
+	<typedef name="list.StateList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">StateList</param>
+	</typedef>
+	<typedef name="list.StringList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">StringList</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl.statesByCountryImpl" entity-name="statesByCountry" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="statesByCountry"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/MixedEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/MixedEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1dd1f763a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/MixedEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.LetterBodyTypeImpl" entity-name="LetterBodyType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="LetterBodyType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.SalutationTypeImpl" entity-name="SalutationType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SalutationType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/MixedEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/MixedEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1dd1f763a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/MixedEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.LetterBodyTypeImpl" entity-name="LetterBodyType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="LetterBodyType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.SalutationTypeImpl" entity-name="SalutationType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SalutationType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/MixedEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/MixedEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1dd1f763a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/MixedEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.LetterBodyTypeImpl" entity-name="LetterBodyType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="LetterBodyType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.SalutationTypeImpl" entity-name="SalutationType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SalutationType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/NestedGroupEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/NestedGroupEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9a8137f75
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/NestedGroupEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,8 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.AImpl" entity-name="A" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="A"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.CTypeImpl" entity-name="CType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="CType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Element"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/NestedGroupEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/NestedGroupEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9a8137f75
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/NestedGroupEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,8 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.AImpl" entity-name="A" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="A"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.CTypeImpl" entity-name="CType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="CType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Element"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/NestedGroupEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/NestedGroupEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9a8137f75
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/NestedGroupEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,8 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.AImpl" entity-name="A" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="A"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.CTypeImpl" entity-name="CType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="CType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Element"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/QNameEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/QNameEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..de98216db
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/QNameEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.impl.MytestImpl" entity-name="Mytest" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Mytest"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/QNameEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/QNameEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..de98216db
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/QNameEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.impl.MytestImpl" entity-name="Mytest" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Mytest"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/QNameEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/QNameEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..de98216db
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/QNameEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,6 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.impl.MytestImpl" entity-name="Mytest" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Mytest"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimpleTypeEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimpleTypeEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6b7d9fc36
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimpleTypeEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,16 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+		<param name="edatatype">SimpleEnumObject</param>
+	</typedef>
+	<typedef name="simpletypes.StringArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+		<param name="edatatype">StringArray</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleListImpl" entity-name="SimpleList" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleList"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeImpl" entity-name="SimpleType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeObjectImpl" entity-name="SimpleTypeObject" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleTypeObject"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimpleTypeEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimpleTypeEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6b7d9fc36
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimpleTypeEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,16 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+		<param name="edatatype">SimpleEnumObject</param>
+	</typedef>
+	<typedef name="simpletypes.StringArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+		<param name="edatatype">StringArray</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleListImpl" entity-name="SimpleList" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleList"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeImpl" entity-name="SimpleType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeObjectImpl" entity-name="SimpleTypeObject" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleTypeObject"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimpleTypeEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimpleTypeEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6b7d9fc36
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimpleTypeEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,16 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+		<param name="edatatype">SimpleEnumObject</param>
+	</typedef>
+	<typedef name="simpletypes.StringArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+		<param name="edatatype">StringArray</param>
+	</typedef>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleListImpl" entity-name="SimpleList" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleList"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeImpl" entity-name="SimpleType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeObjectImpl" entity-name="SimpleTypeObject" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="SimpleTypeObject"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimplefeaturemapEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimplefeaturemapEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b43e8e3f7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimplefeaturemapEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="PurchaseOrder"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.SupplierImpl" entity-name="Supplier" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Supplier"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimplefeaturemapEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimplefeaturemapEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b43e8e3f7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimplefeaturemapEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="PurchaseOrder"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.SupplierImpl" entity-name="Supplier" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Supplier"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimplefeaturemapEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimplefeaturemapEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b43e8e3f7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SimplefeaturemapEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="PurchaseOrder"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.SupplierImpl" entity-name="Supplier" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="Supplier"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..04fb35396
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,10 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.ComplexNumberImpl" entity-name="ComplexNumber" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ComplexNumber"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.EvenComplexNumberTypeImpl" entity-name="EvenComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" discriminator-value="EvenComplexNumberType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.MultiNumberTypeImpl" entity-name="MultiNumberType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="MultiNumberType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.NumberTypeImpl" entity-name="NumberType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="NumberType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.OddComplexNumberTypeImpl" entity-name="OddComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" discriminator-value="OddComplexNumberType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..04fb35396
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,10 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.ComplexNumberImpl" entity-name="ComplexNumber" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ComplexNumber"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.EvenComplexNumberTypeImpl" entity-name="EvenComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" discriminator-value="EvenComplexNumberType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.MultiNumberTypeImpl" entity-name="MultiNumberType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="MultiNumberType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.NumberTypeImpl" entity-name="NumberType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="NumberType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.OddComplexNumberTypeImpl" entity-name="OddComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" discriminator-value="OddComplexNumberType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..04fb35396
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,10 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.ComplexNumberImpl" entity-name="ComplexNumber" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ComplexNumber"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.EvenComplexNumberTypeImpl" entity-name="EvenComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" discriminator-value="EvenComplexNumberType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.MultiNumberTypeImpl" entity-name="MultiNumberType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="MultiNumberType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.NumberTypeImpl" entity-name="NumberType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="NumberType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.OddComplexNumberTypeImpl" entity-name="OddComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" discriminator-value="OddComplexNumberType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionzvonEAVAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionzvonEAVAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4b58da838
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionzvonEAVAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,9 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexAAAImpl" entity-name="ComplexAAA" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ComplexAAA"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexEvenTypeImpl" entity-name="ComplexEvenType" abstract="false" lazy="false" extends="ComplexAAA" discriminator-value="ComplexEvenType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexOddTypeImpl" entity-name="ComplexOddType" abstract="false" lazy="false" extends="ComplexAAA" discriminator-value="ComplexOddType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.RootTypeImpl" entity-name="RootType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="RootType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionzvonEAVAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionzvonEAVAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4b58da838
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionzvonEAVAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,9 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexAAAImpl" entity-name="ComplexAAA" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ComplexAAA"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexEvenTypeImpl" entity-name="ComplexEvenType" abstract="false" lazy="false" extends="ComplexAAA" discriminator-value="ComplexEvenType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexOddTypeImpl" entity-name="ComplexOddType" abstract="false" lazy="false" extends="ComplexAAA" discriminator-value="ComplexOddType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.RootTypeImpl" entity-name="RootType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="RootType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionzvonEAVAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionzvonEAVAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4b58da838
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/SubstitutionzvonEAVAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,9 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexAAAImpl" entity-name="ComplexAAA" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="ComplexAAA"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexEvenTypeImpl" entity-name="ComplexEvenType" abstract="false" lazy="false" extends="ComplexAAA" discriminator-value="ComplexEvenType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexOddTypeImpl" entity-name="ComplexOddType" abstract="false" lazy="false" extends="ComplexAAA" discriminator-value="ComplexOddType"/>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.RootTypeImpl" entity-name="RootType" abstract="false" lazy="false" extends="EAV_EObject" discriminator-value="RootType"/>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1a2a59500
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,129 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" discriminator-value="Book" table="`book`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Book">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz242995.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http:///org/eclipse/example/library.ecore</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" discriminator-value="Library" table="`library`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Library">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" discriminator-value="Writer" table="`writer`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Writer">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.OneTimeWonderImpl" entity-name="OneTimeWonder" abstract="false" lazy="true" discriminator-value="OneTimeWonder" table="`onetimewonder`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.OneTimeWonder">
+		<meta attribute="eclassName">OneTimeWonder</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="foreign">
+				<param name="property">theAuthor</param>
+			</generator>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="onetimewonderdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="true" discriminator-value="Author" table="`author`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Author">
+		<meta attribute="eclassName">Author</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="authordtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theBook" entity-name="OneTimeWonder" cascade="merge,persist,save-update,lock,refresh" lazy="proxy"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f4fce51d3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,114 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" table="`book`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Book">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz242995.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http:///org/eclipse/example/library.ecore</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" table="`library`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Library">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" table="`writer`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Writer">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.OneTimeWonderImpl" entity-name="OneTimeWonder" abstract="false" lazy="true" table="`onetimewonder`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.OneTimeWonder">
+		<meta attribute="eclassName" inherit="false">OneTimeWonder</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="foreign">
+				<param name="property">theAuthor</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="true" table="`author`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Author">
+		<meta attribute="eclassName" inherit="false">Author</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theBook" entity-name="OneTimeWonder" cascade="merge,persist,save-update,lock,refresh" lazy="proxy"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f4fce51d3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,114 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" table="`book`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Book">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz242995.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http:///org/eclipse/example/library.ecore</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" table="`library`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Library">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" table="`writer`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Writer">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.OneTimeWonderImpl" entity-name="OneTimeWonder" abstract="false" lazy="true" table="`onetimewonder`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.OneTimeWonder">
+		<meta attribute="eclassName" inherit="false">OneTimeWonder</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="foreign">
+				<param name="property">theAuthor</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="true" table="`author`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Author">
+		<meta attribute="eclassName" inherit="false">Author</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theBook" entity-name="OneTimeWonder" cascade="merge,persist,save-update,lock,refresh" lazy="proxy"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ285372Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ285372Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c5f527351
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ285372Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,74 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.test.databinding.emfdb.impl.FamilyImpl" entity-name="Family" abstract="false" lazy="false" discriminator-value="Family" table="`family`">
+		<meta attribute="eclassName">Family</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/emfdb/1.0.0</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 type="string">
+			<column name="dtype" index="familydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="string" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`string`"/>
+		</property>
+		<list name="persons" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="family_persons">
+				<column name="`family_persons_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`family_persons_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.test.databinding.emfdb.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/emfdb/1.0.0</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 type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="notes" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="person_notes">
+				<column name="`person_notes_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_notes_idx`"/>
+			<one-to-many entity-name="Note"/>
+		</list>
+		<list name="parents" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="person_parents">
+				<column name="`person_parents_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_parents_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.test.databinding.emfdb.impl.NoteImpl" entity-name="Note" abstract="false" lazy="false" discriminator-value="Note" table="`note`">
+		<meta attribute="eclassName">Note</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/emfdb/1.0.0</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 type="string">
+			<column name="dtype" index="notedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ285372Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ285372Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fa5029d43
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ285372Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,65 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.test.databinding.emfdb.impl.FamilyImpl" entity-name="Family" abstract="false" lazy="false" table="`family`">
+		<meta attribute="eclassName" inherit="false">Family</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/emfdb/1.0.0</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="string" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`string`"/>
+		</property>
+		<list name="persons" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="family_persons">
+				<column name="`family_persons_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`family_persons_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.test.databinding.emfdb.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/emfdb/1.0.0</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="notes" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="person_notes">
+				<column name="`person_notes_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_notes_idx`"/>
+			<one-to-many entity-name="Note"/>
+		</list>
+		<list name="parents" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="person_parents">
+				<column name="`person_parents_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_parents_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.test.databinding.emfdb.impl.NoteImpl" entity-name="Note" abstract="false" lazy="false" table="`note`">
+		<meta attribute="eclassName" inherit="false">Note</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/emfdb/1.0.0</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ285372Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ285372Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fa5029d43
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ285372Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,65 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.test.databinding.emfdb.impl.FamilyImpl" entity-name="Family" abstract="false" lazy="false" table="`family`">
+		<meta attribute="eclassName" inherit="false">Family</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/emfdb/1.0.0</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="string" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`string`"/>
+		</property>
+		<list name="persons" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="family_persons">
+				<column name="`family_persons_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`family_persons_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.test.databinding.emfdb.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/emfdb/1.0.0</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="notes" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="person_notes">
+				<column name="`person_notes_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_notes_idx`"/>
+			<one-to-many entity-name="Note"/>
+		</list>
+		<list name="parents" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="person_parents">
+				<column name="`person_parents_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_parents_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.test.databinding.emfdb.impl.NoteImpl" entity-name="Note" abstract="false" lazy="false" table="`note`">
+		<meta attribute="eclassName" inherit="false">Note</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/emfdb/1.0.0</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1a2a59500
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,129 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" discriminator-value="Book" table="`book`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Book">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz242995.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http:///org/eclipse/example/library.ecore</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" discriminator-value="Library" table="`library`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Library">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" discriminator-value="Writer" table="`writer`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Writer">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.OneTimeWonderImpl" entity-name="OneTimeWonder" abstract="false" lazy="true" discriminator-value="OneTimeWonder" table="`onetimewonder`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.OneTimeWonder">
+		<meta attribute="eclassName">OneTimeWonder</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="foreign">
+				<param name="property">theAuthor</param>
+			</generator>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="onetimewonderdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="true" discriminator-value="Author" table="`author`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Author">
+		<meta attribute="eclassName">Author</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="authordtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theBook" entity-name="OneTimeWonder" cascade="merge,persist,save-update,lock,refresh" lazy="proxy"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f4fce51d3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,114 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" table="`book`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Book">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz242995.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http:///org/eclipse/example/library.ecore</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" table="`library`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Library">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" table="`writer`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Writer">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.OneTimeWonderImpl" entity-name="OneTimeWonder" abstract="false" lazy="true" table="`onetimewonder`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.OneTimeWonder">
+		<meta attribute="eclassName" inherit="false">OneTimeWonder</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="foreign">
+				<param name="property">theAuthor</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="true" table="`author`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Author">
+		<meta attribute="eclassName" inherit="false">Author</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theBook" entity-name="OneTimeWonder" cascade="merge,persist,save-update,lock,refresh" lazy="proxy"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f4fce51d3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,114 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" table="`book`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Book">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz242995.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http:///org/eclipse/example/library.ecore</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" table="`library`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Library">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" table="`writer`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Writer">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.OneTimeWonderImpl" entity-name="OneTimeWonder" abstract="false" lazy="true" table="`onetimewonder`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.OneTimeWonder">
+		<meta attribute="eclassName" inherit="false">OneTimeWonder</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="foreign">
+				<param name="property">theAuthor</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="true" table="`author`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Author">
+		<meta attribute="eclassName" inherit="false">Author</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theBook" entity-name="OneTimeWonder" cascade="merge,persist,save-update,lock,refresh" lazy="proxy"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz243024Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz243024Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..15ecdccba
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz243024Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,43 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz243024.impl.OneImpl" entity-name="One" abstract="false" lazy="false" discriminator-value="One" table="`one`">
+		<meta attribute="eclassName">One</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz243024</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 type="string">
+			<column name="dtype" index="onedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="manies" lazy="true" cascade="delete-orphan,save-update,replicate,delete,persist">
+			<key update="true" foreign-key="one_manies">
+				<column name="`one_manies_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`one_manies_idx`"/>
+			<one-to-many entity-name="Many"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz243024.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" discriminator-value="Many" table="`many`">
+		<meta attribute="eclassName">Many</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz243024</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 type="string">
+			<column name="dtype" index="manydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz243024Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz243024Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ec8d7e39b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz243024Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,37 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz243024.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
+		<meta attribute="eclassName" inherit="false">One</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz243024</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="manies" lazy="true" cascade="delete-orphan,save-update,replicate,delete,persist">
+			<key update="true" foreign-key="one_manies">
+				<column name="`one_manies_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`one_manies_idx`"/>
+			<one-to-many entity-name="Many"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz243024.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
+		<meta attribute="eclassName" inherit="false">Many</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz243024</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz243024Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz243024Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ec8d7e39b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz243024Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,37 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz243024.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
+		<meta attribute="eclassName" inherit="false">One</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz243024</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="manies" lazy="true" cascade="delete-orphan,save-update,replicate,delete,persist">
+			<key update="true" foreign-key="one_manies">
+				<column name="`one_manies_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`one_manies_idx`"/>
+			<one-to-many entity-name="Many"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz243024.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
+		<meta attribute="eclassName" inherit="false">Many</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz243024</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e54aef865
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,129 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz242995.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http:///org/eclipse/example/library.ecore</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.OneTimeWonderImpl" entity-name="OneTimeWonder" abstract="false" lazy="false" discriminator-value="OneTimeWonder" table="`onetimewonder`">
+		<meta attribute="eclassName">OneTimeWonder</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="foreign">
+				<param name="property">theAuthor</param>
+			</generator>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="onetimewonderdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="false" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="false" discriminator-value="Author" table="`author`">
+		<meta attribute="eclassName">Author</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="authordtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theBook" entity-name="OneTimeWonder" cascade="merge,persist,save-update,lock,refresh" lazy="false"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..855ec60ca
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,114 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz242995.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http:///org/eclipse/example/library.ecore</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.OneTimeWonderImpl" entity-name="OneTimeWonder" abstract="false" lazy="false" table="`onetimewonder`">
+		<meta attribute="eclassName" inherit="false">OneTimeWonder</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="foreign">
+				<param name="property">theAuthor</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="false" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="false" table="`author`">
+		<meta attribute="eclassName" inherit="false">Author</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theBook" entity-name="OneTimeWonder" cascade="merge,persist,save-update,lock,refresh" lazy="false"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..855ec60ca
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,114 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz242995.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http:///org/eclipse/example/library.ecore</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.OneTimeWonderImpl" entity-name="OneTimeWonder" abstract="false" lazy="false" table="`onetimewonder`">
+		<meta attribute="eclassName" inherit="false">OneTimeWonder</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="foreign">
+				<param name="property">theAuthor</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="false" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="false" table="`author`">
+		<meta attribute="eclassName" inherit="false">Author</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theBook" entity-name="OneTimeWonder" cascade="merge,persist,save-update,lock,refresh" lazy="false"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245634Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245634Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c4f7d5b87
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245634Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,67 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz245634.impl.CityImpl" entity-name="City" abstract="false" lazy="true" discriminator-value="City" table="`city`" proxy="org.eclipse.emf.teneo.samples.issues.bz245634.City">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz245634</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="citydtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="mayor" entity-name="Mayor" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="proxy" insert="true" update="true"/>
+		<one-to-one name="policeChief" entity-name="PoliceChief" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" property-ref="city"/>
+		<many-to-one name="country" entity-name="Country" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="city_country" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`country_country_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz245634.impl.MayorImpl" entity-name="Mayor" abstract="false" lazy="true" discriminator-value="Mayor" table="`mayor`" proxy="org.eclipse.emf.teneo.samples.issues.bz245634.Mayor">
+		<meta attribute="eclassName">Mayor</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz245634</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 type="string">
+			<column name="dtype" index="mayordtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<one-to-one name="city" entity-name="City" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" property-ref="mayor"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz245634.impl.PoliceChiefImpl" entity-name="PoliceChief" abstract="false" lazy="true" discriminator-value="PoliceChief" table="`policechief`" proxy="org.eclipse.emf.teneo.samples.issues.bz245634.PoliceChief">
+		<meta attribute="eclassName">PoliceChief</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz245634</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 type="string">
+			<column name="dtype" index="policechiefdtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="city" entity-name="City" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="proxy" insert="true" update="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz245634.impl.CountryImpl" entity-name="Country" abstract="false" lazy="true" discriminator-value="Country" table="`country`" proxy="org.eclipse.emf.teneo.samples.issues.bz245634.Country">
+		<meta attribute="eclassName">Country</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz245634</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 type="string">
+			<column name="dtype" index="countrydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245634Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245634Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..568a2bcaa
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245634Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,55 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz245634.impl.CityImpl" entity-name="City" abstract="false" lazy="true" table="`city`" proxy="org.eclipse.emf.teneo.samples.issues.bz245634.City">
+		<meta attribute="eclassName" inherit="false">City</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz245634</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<many-to-one name="mayor" entity-name="Mayor" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="proxy" insert="true" update="true"/>
+		<one-to-one name="policeChief" entity-name="PoliceChief" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" property-ref="city"/>
+		<many-to-one name="country" entity-name="Country" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="city_country" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`country_country_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz245634.impl.MayorImpl" entity-name="Mayor" abstract="false" lazy="true" table="`mayor`" proxy="org.eclipse.emf.teneo.samples.issues.bz245634.Mayor">
+		<meta attribute="eclassName" inherit="false">Mayor</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz245634</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<one-to-one name="city" entity-name="City" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" property-ref="mayor"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz245634.impl.PoliceChiefImpl" entity-name="PoliceChief" abstract="false" lazy="true" table="`policechief`" proxy="org.eclipse.emf.teneo.samples.issues.bz245634.PoliceChief">
+		<meta attribute="eclassName" inherit="false">PoliceChief</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz245634</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="city" entity-name="City" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="proxy" insert="true" update="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz245634.impl.CountryImpl" entity-name="Country" abstract="false" lazy="true" table="`country`" proxy="org.eclipse.emf.teneo.samples.issues.bz245634.Country">
+		<meta attribute="eclassName" inherit="false">Country</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz245634</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245634Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245634Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..568a2bcaa
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245634Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,55 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz245634.impl.CityImpl" entity-name="City" abstract="false" lazy="true" table="`city`" proxy="org.eclipse.emf.teneo.samples.issues.bz245634.City">
+		<meta attribute="eclassName" inherit="false">City</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz245634</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<many-to-one name="mayor" entity-name="Mayor" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="proxy" insert="true" update="true"/>
+		<one-to-one name="policeChief" entity-name="PoliceChief" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" property-ref="city"/>
+		<many-to-one name="country" entity-name="Country" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="city_country" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`country_country_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz245634.impl.MayorImpl" entity-name="Mayor" abstract="false" lazy="true" table="`mayor`" proxy="org.eclipse.emf.teneo.samples.issues.bz245634.Mayor">
+		<meta attribute="eclassName" inherit="false">Mayor</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz245634</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<one-to-one name="city" entity-name="City" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" property-ref="mayor"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz245634.impl.PoliceChiefImpl" entity-name="PoliceChief" abstract="false" lazy="true" table="`policechief`" proxy="org.eclipse.emf.teneo.samples.issues.bz245634.PoliceChief">
+		<meta attribute="eclassName" inherit="false">PoliceChief</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz245634</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="city" entity-name="City" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="proxy" insert="true" update="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz245634.impl.CountryImpl" entity-name="Country" abstract="false" lazy="true" table="`country`" proxy="org.eclipse.emf.teneo.samples.issues.bz245634.Country">
+		<meta attribute="eclassName" inherit="false">Country</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz245634</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280355Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280355Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..09b77863c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280355Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,36 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz280355.impl.LeiterImpl" entity-name="Leiter" abstract="false" lazy="false" discriminator-value="Leiter" table="`leiter`">
+		<meta attribute="eclassName">Leiter</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz280355</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="leiterdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="version" type="long">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+		<many-to-one name="person" entity-name="Person" lazy="false" cascade="all" foreign-key="leiter_person" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`person_person_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz280355.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz280355</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="version" type="long">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280355Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280355Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e167e7261
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280355Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,30 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz280355.impl.LeiterImpl" entity-name="Leiter" abstract="false" lazy="false" table="`leiter`">
+		<meta attribute="eclassName" inherit="false">Leiter</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz280355</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="version" type="long">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+		<many-to-one name="person" entity-name="Person" lazy="false" cascade="all" foreign-key="leiter_person" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`person_person_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz280355.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz280355</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="version" type="long">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280355Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280355Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e167e7261
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280355Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,30 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz280355.impl.LeiterImpl" entity-name="Leiter" abstract="false" lazy="false" table="`leiter`">
+		<meta attribute="eclassName" inherit="false">Leiter</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz280355</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="version" type="long">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+		<many-to-one name="person" entity-name="Person" lazy="false" cascade="all" foreign-key="leiter_person" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`person_person_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz280355.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz280355</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="version" type="long">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..5c075f980
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,1099 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.w3._2000._09.xmldsig.impl.CanonicalizationMethodTypeImpl" entity-name="CanonicalizationMethodType" abstract="false" lazy="false" discriminator-value="CanonicalizationMethodType" table="`canonicalizationmethodtype`">
+		<meta attribute="eclassName">CanonicalizationMethodType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</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 type="string">
+			<column name="dtype" index="canonicalizationmethodtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="mixed" table="`canonicalizationmethodtype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`canonicalizationmethodtype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`canonicalizationmethodtype_mixed_idx`"/>
+			<one-to-many entity-name="CanonicalizationMethodType_mixed"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`algorithm`"/>
+		</property>
+	</class>
+	<class entity-name="CanonicalizationMethodType_mixed" lazy="false" table="`canonicalizationmethodtype_mixed`">
+		<meta attribute="featureMap">CanonicalizationMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="any" table="`mixed_canonicalizationmethodtype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_canonicalizationmethodtype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_canonicalizationmethodtype_any_idx`"/>
+			<one-to-many entity-name="CanonicalizationMethodType_any"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_algorithm`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="CanonicalizationMethodType_any" lazy="false" table="`canonicalizationmethodtype_any`">
+		<meta attribute="featureMap">CanonicalizationMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.DigestMethodTypeImpl" entity-name="DigestMethodType" abstract="false" lazy="false" discriminator-value="DigestMethodType" table="`digestmethodtype`">
+		<meta attribute="eclassName">DigestMethodType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</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 type="string">
+			<column name="dtype" index="digestmethodtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="mixed" table="`digestmethodtype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`digestmethodtype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`digestmethodtype_mixed_idx`"/>
+			<one-to-many entity-name="DigestMethodType_mixed"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`algorithm`"/>
+		</property>
+	</class>
+	<class entity-name="DigestMethodType_mixed" lazy="false" table="`digestmethodtype_mixed`">
+		<meta attribute="featureMap">DigestMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="any" table="`mixed_digestmethodtype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_digestmethodtype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_digestmethodtype_any_idx`"/>
+			<one-to-many entity-name="DigestMethodType_any"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_algorithm`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="DigestMethodType_any" lazy="false" table="`digestmethodtype_any`">
+		<meta attribute="featureMap">DigestMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.DSAKeyValueTypeImpl" entity-name="DSAKeyValueType" abstract="false" lazy="false" discriminator-value="DSAKeyValueType" table="`dsakeyvaluetype`">
+		<meta attribute="eclassName">DSAKeyValueType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</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 type="string">
+			<column name="dtype" index="dsakeyvaluetypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<array name="p" table="`dsakeyvaluetype_p`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_p_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_p_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="q" table="`dsakeyvaluetype_q`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_q_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_q_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="g" table="`dsakeyvaluetype_g`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_g_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_g_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="y" table="`dsakeyvaluetype_y`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_y_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_y_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="j" table="`dsakeyvaluetype_j`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_j_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_j_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="seed" table="`dsakeyvaluetype_seed`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_seed_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_seed_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="pgenCounter" table="`dsakeyvaluetype_pgencounter`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_pgencounter_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_pgencounter_idx`"/>
+			<element type="byte"/>
+		</array>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.KeyInfoTypeImpl" entity-name="KeyInfoType" abstract="false" lazy="false" discriminator-value="KeyInfoType" table="`keyinfotype`">
+		<meta attribute="eclassName">KeyInfoType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="keyinfotypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="mixed" table="`keyinfotype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`keyinfotype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`keyinfotype_mixed_idx`"/>
+			<one-to-many entity-name="KeyInfoType_mixed"/>
+		</list>
+	</class>
+	<class entity-name="KeyInfoType_mixed" lazy="false" table="`keyinfotype_mixed`">
+		<meta attribute="featureMap">KeyInfoType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="group" table="`mixed_keyinfotype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_keyinfotype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_keyinfotype_group_idx`"/>
+			<one-to-many entity-name="KeyInfoType_group"/>
+		</list>
+		<property name="keyName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_keyname`"/>
+		</property>
+		<many-to-one name="keyValue" entity-name="KeyValueType" lazy="false" cascade="all" foreign-key="keyinfotype_keyvalue" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_keyvaluetype_keyvalue_e_id`"/>
+		</many-to-one>
+		<many-to-one name="retrievalMethod" entity-name="RetrievalMethodType" lazy="false" cascade="all" foreign-key="keyinfotype_retrievalmethod" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_retrievalmethodtype_retrievalmethod_e_id`"/>
+		</many-to-one>
+		<many-to-one name="x509Data" entity-name="X509DataType" lazy="false" cascade="all" foreign-key="keyinfotype_x509data" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_x509datatype_x509data_e_id`"/>
+		</many-to-one>
+		<many-to-one name="pGPData" entity-name="PGPDataType" lazy="false" cascade="all" foreign-key="keyinfotype_pgpdata" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_pgpdatatype_pgpdata_e_id`"/>
+		</many-to-one>
+		<many-to-one name="sPKIData" entity-name="SPKIDataType" lazy="false" cascade="all" foreign-key="keyinfotype_spkidata" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_spkidatatype_spkidata_e_id`"/>
+		</many-to-one>
+		<property name="mgmtData" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_mgmtdata`"/>
+		</property>
+		<many-to-one name="any" entity-name="KeyInfoType_any" cascade="all" 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="`mixed_id`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="KeyInfoType_group" lazy="false" table="`keyinfotype_group`">
+		<meta attribute="featureMap">KeyInfoType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="keyName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_keyname`"/>
+		</property>
+		<many-to-one name="keyValue" entity-name="KeyValueType" lazy="false" cascade="all" foreign-key="keyinfotype_keyvalue" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_keyvaluetype_keyvalue_e_id`"/>
+		</many-to-one>
+		<many-to-one name="retrievalMethod" entity-name="RetrievalMethodType" lazy="false" cascade="all" foreign-key="keyinfotype_retrievalmethod" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_retrievalmethodtype_retrievalmethod_e_id`"/>
+		</many-to-one>
+		<many-to-one name="x509Data" entity-name="X509DataType" lazy="false" cascade="all" foreign-key="keyinfotype_x509data" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_x509datatype_x509data_e_id`"/>
+		</many-to-one>
+		<many-to-one name="pGPData" entity-name="PGPDataType" lazy="false" cascade="all" foreign-key="keyinfotype_pgpdata" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_pgpdatatype_pgpdata_e_id`"/>
+		</many-to-one>
+		<many-to-one name="sPKIData" entity-name="SPKIDataType" lazy="false" cascade="all" foreign-key="keyinfotype_spkidata" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_spkidatatype_spkidata_e_id`"/>
+		</many-to-one>
+		<property name="mgmtData" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_mgmtdata`"/>
+		</property>
+		<many-to-one name="any" entity-name="KeyInfoType_any" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="KeyInfoType_any" lazy="false" table="`keyinfotype_any`">
+		<meta attribute="featureMap">KeyInfoType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.KeyValueTypeImpl" entity-name="KeyValueType" abstract="false" lazy="false" discriminator-value="KeyValueType" table="`keyvaluetype`">
+		<meta attribute="eclassName">KeyValueType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</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 type="string">
+			<column name="dtype" index="keyvaluetypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="mixed" table="`keyvaluetype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`keyvaluetype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`keyvaluetype_mixed_idx`"/>
+			<one-to-many entity-name="KeyValueType_mixed"/>
+		</list>
+	</class>
+	<class entity-name="KeyValueType_mixed" lazy="false" table="`keyvaluetype_mixed`">
+		<meta attribute="featureMap">KeyValueType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="dSAKeyValue" entity-name="DSAKeyValueType" lazy="false" cascade="all" foreign-key="keyvaluetype_dsakeyvalue" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_dsakeyvaluetype_dsakeyvalue_e_id`"/>
+		</many-to-one>
+		<many-to-one name="rSAKeyValue" entity-name="RSAKeyValueType" lazy="false" cascade="all" foreign-key="keyvaluetype_rsakeyvalue" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_rsakeyvaluetype_rsakeyvalue_e_id`"/>
+		</many-to-one>
+		<list name="any" table="`mixed_keyvaluetype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_keyvaluetype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_keyvaluetype_any_idx`"/>
+			<one-to-many entity-name="KeyValueType_any"/>
+		</list>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="KeyValueType_any" lazy="false" table="`keyvaluetype_any`">
+		<meta attribute="featureMap">KeyValueType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.ManifestTypeImpl" entity-name="ManifestType" abstract="false" lazy="false" discriminator-value="ManifestType" table="`manifesttype`">
+		<meta attribute="eclassName">ManifestType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="manifesttypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="reference" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="manifesttype_reference">
+				<column name="`manifesttype_reference_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`manifesttype_reference_idx`"/>
+			<one-to-many entity-name="ReferenceType"/>
+		</list>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.ObjectTypeImpl" entity-name="ObjectType" abstract="false" lazy="false" discriminator-value="ObjectType" table="`objecttype`">
+		<meta attribute="eclassName">ObjectType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="objecttypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="mixed" table="`objecttype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`objecttype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`objecttype_mixed_idx`"/>
+			<one-to-many entity-name="ObjectType_mixed"/>
+		</list>
+		<property name="encoding" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`encoding`"/>
+		</property>
+		<property name="mimeType" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mimetype`"/>
+		</property>
+	</class>
+	<class entity-name="ObjectType_mixed" lazy="false" table="`objecttype_mixed`">
+		<meta attribute="featureMap">ObjectType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="group" table="`mixed_objecttype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_objecttype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_objecttype_group_idx`"/>
+			<one-to-many entity-name="ObjectType_group"/>
+		</list>
+		<many-to-one name="any" entity-name="ObjectType_any" cascade="all" not-null="false"/>
+		<property name="encoding" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_encoding`"/>
+		</property>
+		<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="`mixed_id`"/>
+		</property>
+		<property name="mimeType" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_mimetype`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="ObjectType_group" lazy="false" table="`objecttype_group`">
+		<meta attribute="featureMap">ObjectType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="any" entity-name="ObjectType_any" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="ObjectType_any" lazy="false" table="`objecttype_any`">
+		<meta attribute="featureMap">ObjectType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.PGPDataTypeImpl" entity-name="PGPDataType" abstract="false" lazy="false" discriminator-value="PGPDataType" table="`pgpdatatype`">
+		<meta attribute="eclassName">PGPDataType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</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 type="string">
+			<column name="dtype" index="pgpdatatypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<array name="pGPKeyID" table="`pgpdatatype_pgpkeyid`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pgpdatatype_pgpkeyid_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`pgpdatatype_pgpkeyid_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="pGPKeyPacket" table="`pgpdatatype_pgpkeypacket`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pgpdatatype_pgpkeypacket_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`pgpdatatype_pgpkeypacket_idx`"/>
+			<element type="byte"/>
+		</array>
+		<list name="any" table="`pgpdatatype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pgpdatatype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`pgpdatatype_any_idx`"/>
+			<one-to-many entity-name="PGPDataType_any"/>
+		</list>
+		<array name="pGPKeyPacket1" table="`pgpdatatype_pgpkeypacket1`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pgpdatatype_pgpkeypacket1_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`pgpdatatype_pgpkeypacket1_idx`"/>
+			<element type="byte"/>
+		</array>
+		<list name="any1" table="`pgpdatatype_any1`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pgpdatatype_any1_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`pgpdatatype_any1_idx`"/>
+			<one-to-many entity-name="PGPDataType_any1"/>
+		</list>
+	</class>
+	<class entity-name="PGPDataType_any" lazy="false" table="`pgpdatatype_any`">
+		<meta attribute="featureMap">PGPDataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class entity-name="PGPDataType_any1" lazy="false" table="`pgpdatatype_any1`">
+		<meta attribute="featureMap">PGPDataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any1_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any1_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any1_type`"/>
+			<column not-null="false" unique="false" name="`any1_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.ReferenceTypeImpl" entity-name="ReferenceType" abstract="false" lazy="false" discriminator-value="ReferenceType" table="`referencetype`">
+		<meta attribute="eclassName">ReferenceType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="referencetypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="transforms" entity-name="TransformsType" lazy="false" cascade="all" foreign-key="referencetype_transforms" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`transformstype_transforms_e_id`"/>
+		</many-to-one>
+		<many-to-one name="digestMethod" entity-name="DigestMethodType" lazy="false" cascade="all" foreign-key="referencetype_digestmethod" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`digestmethodtype_digestmethod_e_id`"/>
+		</many-to-one>
+		<array name="digestValue" table="`referencetype_digestvalue`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`referencetype_digestvalue_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`referencetype_digestvalue_idx`"/>
+			<element type="byte"/>
+		</array>
+		<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>
+		<property name="uRI" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`uri`"/>
+		</property>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.RetrievalMethodTypeImpl" entity-name="RetrievalMethodType" abstract="false" lazy="false" discriminator-value="RetrievalMethodType" table="`retrievalmethodtype`">
+		<meta attribute="eclassName">RetrievalMethodType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</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 type="string">
+			<column name="dtype" index="retrievalmethodtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="transforms" entity-name="TransformsType" lazy="false" cascade="all" foreign-key="retrievalmethodtype_transforms" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`transformstype_transforms_e_id`"/>
+		</many-to-one>
+		<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>
+		<property name="uRI" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`uri`"/>
+		</property>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.RSAKeyValueTypeImpl" entity-name="RSAKeyValueType" abstract="false" lazy="false" discriminator-value="RSAKeyValueType" table="`rsakeyvaluetype`">
+		<meta attribute="eclassName">RSAKeyValueType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</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 type="string">
+			<column name="dtype" index="rsakeyvaluetypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<array name="modulus" table="`rsakeyvaluetype_modulus`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`rsakeyvaluetype_modulus_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`rsakeyvaluetype_modulus_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="exponent" table="`rsakeyvaluetype_exponent`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`rsakeyvaluetype_exponent_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`rsakeyvaluetype_exponent_idx`"/>
+			<element type="byte"/>
+		</array>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignatureMethodTypeImpl" entity-name="SignatureMethodType" abstract="false" lazy="false" discriminator-value="SignatureMethodType" table="`signaturemethodtype`">
+		<meta attribute="eclassName">SignatureMethodType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</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 type="string">
+			<column name="dtype" index="signaturemethodtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="mixed" table="`signaturemethodtype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`signaturemethodtype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`signaturemethodtype_mixed_idx`"/>
+			<one-to-many entity-name="SignatureMethodType_mixed"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`algorithm`"/>
+		</property>
+	</class>
+	<class entity-name="SignatureMethodType_mixed" lazy="false" table="`signaturemethodtype_mixed`">
+		<meta attribute="featureMap">SignatureMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="hMACOutputLength" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`mixed_hmacoutputlength`"/>
+		</property>
+		<list name="any" table="`mixed_signaturemethodtype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_signaturemethodtype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_signaturemethodtype_any_idx`"/>
+			<one-to-many entity-name="SignatureMethodType_any"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_algorithm`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="SignatureMethodType_any" lazy="false" table="`signaturemethodtype_any`">
+		<meta attribute="featureMap">SignatureMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignaturePropertiesTypeImpl" entity-name="SignaturePropertiesType" abstract="false" lazy="false" discriminator-value="SignaturePropertiesType" table="`signaturepropertiestype`">
+		<meta attribute="eclassName">SignaturePropertiesType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="signaturepropertiestypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="signatureProperty" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="signaturepropertiestype_signatureproperty">
+				<column name="`signaturepropertiestype_signatureproperty_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`signaturepropertiestype_signatureproperty_idx`"/>
+			<one-to-many entity-name="SignaturePropertyType"/>
+		</list>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignaturePropertyTypeImpl" entity-name="SignaturePropertyType" abstract="false" lazy="false" discriminator-value="SignaturePropertyType" table="`signaturepropertytype`">
+		<meta attribute="eclassName">SignaturePropertyType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="signaturepropertytypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="mixed" table="`signaturepropertytype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`signaturepropertytype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`signaturepropertytype_mixed_idx`"/>
+			<one-to-many entity-name="SignaturePropertyType_mixed"/>
+		</list>
+		<property name="target" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`target`"/>
+		</property>
+	</class>
+	<class entity-name="SignaturePropertyType_mixed" lazy="false" table="`signaturepropertytype_mixed`">
+		<meta attribute="featureMap">SignaturePropertyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="group" table="`mixed_signaturepropertytype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_signaturepropertytype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_signaturepropertytype_group_idx`"/>
+			<one-to-many entity-name="SignaturePropertyType_group"/>
+		</list>
+		<many-to-one name="any" entity-name="SignaturePropertyType_any" cascade="all" 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="`mixed_id`"/>
+		</property>
+		<property name="target" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_target`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="SignaturePropertyType_group" lazy="false" table="`signaturepropertytype_group`">
+		<meta attribute="featureMap">SignaturePropertyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="any" entity-name="SignaturePropertyType_any" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="SignaturePropertyType_any" lazy="false" table="`signaturepropertytype_any`">
+		<meta attribute="featureMap">SignaturePropertyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignatureTypeImpl" entity-name="SignatureType" abstract="false" lazy="false" discriminator-value="SignatureType" table="`signaturetype`">
+		<meta attribute="eclassName">SignatureType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="signaturetypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="signedInfo" entity-name="SignedInfoType" lazy="false" cascade="all" foreign-key="signaturetype_signedinfo" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`signedinfotype_signedinfo_e_id`"/>
+		</many-to-one>
+		<many-to-one name="signatureValue" entity-name="SignatureValueType" lazy="false" cascade="all" foreign-key="signaturetype_signaturevalue" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`signaturevaluetype_signaturevalue_e_id`"/>
+		</many-to-one>
+		<many-to-one name="keyInfo" entity-name="KeyInfoType" lazy="false" cascade="all" foreign-key="signaturetype_keyinfo" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`keyinfotype_keyinfo_id`"/>
+		</many-to-one>
+		<list name="object" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="signaturetype_object">
+				<column name="`signaturetype_object_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`signaturetype_object_idx`"/>
+			<one-to-many entity-name="ObjectType"/>
+		</list>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignatureValueTypeImpl" entity-name="SignatureValueType" abstract="false" lazy="false" discriminator-value="SignatureValueType" table="`signaturevaluetype`">
+		<meta attribute="eclassName">SignatureValueType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="signaturevaluetypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<array name="value" table="`signaturevaluetype_value`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`signaturevaluetype_value_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`signaturevaluetype_value_idx`"/>
+			<element type="byte"/>
+		</array>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignedInfoTypeImpl" entity-name="SignedInfoType" abstract="false" lazy="false" discriminator-value="SignedInfoType" table="`signedinfotype`">
+		<meta attribute="eclassName">SignedInfoType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="signedinfotypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="canonicalizationMethod" entity-name="CanonicalizationMethodType" lazy="false" cascade="all" foreign-key="signedinfotype_canonicalizationmethod" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`canonicalizationmethodtype_canonicalizationmethod_e_id`"/>
+		</many-to-one>
+		<many-to-one name="signatureMethod" entity-name="SignatureMethodType" lazy="false" cascade="all" foreign-key="signedinfotype_signaturemethod" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`signaturemethodtype_signaturemethod_e_id`"/>
+		</many-to-one>
+		<list name="reference" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="signedinfotype_reference">
+				<column name="`signedinfotype_reference_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`signedinfotype_reference_idx`"/>
+			<one-to-many entity-name="ReferenceType"/>
+		</list>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SPKIDataTypeImpl" entity-name="SPKIDataType" abstract="false" lazy="false" discriminator-value="SPKIDataType" table="`spkidatatype`">
+		<meta attribute="eclassName">SPKIDataType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</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 type="string">
+			<column name="dtype" index="spkidatatypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="group" table="`spkidatatype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`spkidatatype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`spkidatatype_group_idx`"/>
+			<one-to-many entity-name="SPKIDataType_group"/>
+		</list>
+	</class>
+	<class entity-name="SPKIDataType_group" lazy="false" table="`spkidatatype_group`">
+		<meta attribute="featureMap">SPKIDataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="sPKISexp" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`group_spkisexp`"/>
+		</property>
+		<many-to-one name="any" entity-name="SPKIDataType_any" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="SPKIDataType_any" lazy="false" table="`spkidatatype_any`">
+		<meta attribute="featureMap">SPKIDataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.TransformsTypeImpl" entity-name="TransformsType" abstract="false" lazy="false" discriminator-value="TransformsType" table="`transformstype`">
+		<meta attribute="eclassName">TransformsType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</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 type="string">
+			<column name="dtype" index="transformstypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="transform" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="transformstype_transform">
+				<column name="`transformstype_transform_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`transformstype_transform_idx`"/>
+			<one-to-many entity-name="TransformType"/>
+		</list>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.TransformTypeImpl" entity-name="TransformType" abstract="false" lazy="false" discriminator-value="TransformType" table="`transformtype`">
+		<meta attribute="eclassName">TransformType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</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 type="string">
+			<column name="dtype" index="transformtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="mixed" table="`transformtype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`transformtype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`transformtype_mixed_idx`"/>
+			<one-to-many entity-name="TransformType_mixed"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`algorithm`"/>
+		</property>
+	</class>
+	<class entity-name="TransformType_mixed" lazy="false" table="`transformtype_mixed`">
+		<meta attribute="featureMap">TransformType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="group" table="`mixed_transformtype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_transformtype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_transformtype_group_idx`"/>
+			<one-to-many entity-name="TransformType_group"/>
+		</list>
+		<many-to-one name="any" entity-name="TransformType_any" cascade="all" not-null="false"/>
+		<property name="xPath" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_xpath`"/>
+		</property>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_algorithm`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="TransformType_group" lazy="false" table="`transformtype_group`">
+		<meta attribute="featureMap">TransformType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="any" entity-name="TransformType_any" cascade="all" not-null="false"/>
+		<property name="xPath" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_xpath`"/>
+		</property>
+	</class>
+	<class entity-name="TransformType_any" lazy="false" table="`transformtype_any`">
+		<meta attribute="featureMap">TransformType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.X509DataTypeImpl" entity-name="X509DataType" abstract="false" lazy="false" discriminator-value="X509DataType" table="`x509datatype`">
+		<meta attribute="eclassName">X509DataType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</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 type="string">
+			<column name="dtype" index="x509datatypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="group" table="`x509datatype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`x509datatype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`x509datatype_group_idx`"/>
+			<one-to-many entity-name="X509DataType_group"/>
+		</list>
+	</class>
+	<class entity-name="X509DataType_group" lazy="false" table="`x509datatype_group`">
+		<meta attribute="featureMap">X509DataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="x509IssuerSerial" entity-name="X509IssuerSerialType" lazy="false" cascade="all" foreign-key="x509datatype_x509issuerserial" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_x509issuerserialtype_x509issuerserial_e_id`"/>
+		</many-to-one>
+		<property name="x509SKI" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`group_x509ski`"/>
+		</property>
+		<property name="x509SubjectName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_x509subjectname`"/>
+		</property>
+		<property name="x509Certificate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`group_x509certificate`"/>
+		</property>
+		<property name="x509CRL" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`group_x509crl`"/>
+		</property>
+		<many-to-one name="any" entity-name="X509DataType_any" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="X509DataType_any" lazy="false" table="`x509datatype_any`">
+		<meta attribute="featureMap">X509DataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.X509IssuerSerialTypeImpl" entity-name="X509IssuerSerialType" abstract="false" lazy="false" discriminator-value="X509IssuerSerialType" table="`x509issuerserialtype`">
+		<meta attribute="eclassName">X509IssuerSerialType</meta>
+		<meta attribute="epackage">http://www.w3.org/2000/09/xmldsig#</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 type="string">
+			<column name="dtype" index="x509issuerserialtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="x509IssuerName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`x509issuername`"/>
+		</property>
+		<property name="x509SerialNumber" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
+			<column not-null="true" unique="false" name="`x509serialnumber`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a4dcb1058
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,1033 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.w3._2000._09.xmldsig.impl.CanonicalizationMethodTypeImpl" entity-name="CanonicalizationMethodType" abstract="false" lazy="false" table="`canonicalizationmethodtype`">
+		<meta attribute="eclassName" inherit="false">CanonicalizationMethodType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`canonicalizationmethodtype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`canonicalizationmethodtype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`canonicalizationmethodtype_mixed_idx`"/>
+			<one-to-many entity-name="CanonicalizationMethodType_mixed"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`algorithm`"/>
+		</property>
+	</class>
+	<class entity-name="CanonicalizationMethodType_mixed" lazy="false" table="`canonicalizationmethodtype_mixed`">
+		<meta attribute="featureMap" inherit="false">CanonicalizationMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="any" table="`mixed_canonicalizationmethodtype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_canonicalizationmethodtype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_canonicalizationmethodtype_any_idx`"/>
+			<one-to-many entity-name="CanonicalizationMethodType_any"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_algorithm`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="CanonicalizationMethodType_any" lazy="false" table="`canonicalizationmethodtype_any`">
+		<meta attribute="featureMap" inherit="false">CanonicalizationMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.DigestMethodTypeImpl" entity-name="DigestMethodType" abstract="false" lazy="false" table="`digestmethodtype`">
+		<meta attribute="eclassName" inherit="false">DigestMethodType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`digestmethodtype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`digestmethodtype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`digestmethodtype_mixed_idx`"/>
+			<one-to-many entity-name="DigestMethodType_mixed"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`algorithm`"/>
+		</property>
+	</class>
+	<class entity-name="DigestMethodType_mixed" lazy="false" table="`digestmethodtype_mixed`">
+		<meta attribute="featureMap" inherit="false">DigestMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="any" table="`mixed_digestmethodtype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_digestmethodtype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_digestmethodtype_any_idx`"/>
+			<one-to-many entity-name="DigestMethodType_any"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_algorithm`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="DigestMethodType_any" lazy="false" table="`digestmethodtype_any`">
+		<meta attribute="featureMap" inherit="false">DigestMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.DSAKeyValueTypeImpl" entity-name="DSAKeyValueType" abstract="false" lazy="false" table="`dsakeyvaluetype`">
+		<meta attribute="eclassName" inherit="false">DSAKeyValueType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<array name="p" table="`dsakeyvaluetype_p`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_p_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_p_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="q" table="`dsakeyvaluetype_q`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_q_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_q_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="g" table="`dsakeyvaluetype_g`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_g_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_g_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="y" table="`dsakeyvaluetype_y`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_y_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_y_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="j" table="`dsakeyvaluetype_j`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_j_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_j_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="seed" table="`dsakeyvaluetype_seed`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_seed_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_seed_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="pgenCounter" table="`dsakeyvaluetype_pgencounter`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_pgencounter_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_pgencounter_idx`"/>
+			<element type="byte"/>
+		</array>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.KeyInfoTypeImpl" entity-name="KeyInfoType" abstract="false" lazy="false" table="`keyinfotype`">
+		<meta attribute="eclassName" inherit="false">KeyInfoType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`keyinfotype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`keyinfotype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`keyinfotype_mixed_idx`"/>
+			<one-to-many entity-name="KeyInfoType_mixed"/>
+		</list>
+	</class>
+	<class entity-name="KeyInfoType_mixed" lazy="false" table="`keyinfotype_mixed`">
+		<meta attribute="featureMap" inherit="false">KeyInfoType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="group" table="`mixed_keyinfotype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_keyinfotype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_keyinfotype_group_idx`"/>
+			<one-to-many entity-name="KeyInfoType_group"/>
+		</list>
+		<property name="keyName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_keyname`"/>
+		</property>
+		<many-to-one name="keyValue" entity-name="KeyValueType" lazy="false" cascade="all" foreign-key="keyinfotype_keyvalue" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_keyvaluetype_keyvalue_e_id`"/>
+		</many-to-one>
+		<many-to-one name="retrievalMethod" entity-name="RetrievalMethodType" lazy="false" cascade="all" foreign-key="keyinfotype_retrievalmethod" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_retrievalmethodtype_retrievalmethod_e_id`"/>
+		</many-to-one>
+		<many-to-one name="x509Data" entity-name="X509DataType" lazy="false" cascade="all" foreign-key="keyinfotype_x509data" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_x509datatype_x509data_e_id`"/>
+		</many-to-one>
+		<many-to-one name="pGPData" entity-name="PGPDataType" lazy="false" cascade="all" foreign-key="keyinfotype_pgpdata" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_pgpdatatype_pgpdata_e_id`"/>
+		</many-to-one>
+		<many-to-one name="sPKIData" entity-name="SPKIDataType" lazy="false" cascade="all" foreign-key="keyinfotype_spkidata" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_spkidatatype_spkidata_e_id`"/>
+		</many-to-one>
+		<property name="mgmtData" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_mgmtdata`"/>
+		</property>
+		<many-to-one name="any" entity-name="KeyInfoType_any" cascade="all" 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="`mixed_id`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="KeyInfoType_group" lazy="false" table="`keyinfotype_group`">
+		<meta attribute="featureMap" inherit="false">KeyInfoType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="keyName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_keyname`"/>
+		</property>
+		<many-to-one name="keyValue" entity-name="KeyValueType" lazy="false" cascade="all" foreign-key="keyinfotype_keyvalue" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_keyvaluetype_keyvalue_e_id`"/>
+		</many-to-one>
+		<many-to-one name="retrievalMethod" entity-name="RetrievalMethodType" lazy="false" cascade="all" foreign-key="keyinfotype_retrievalmethod" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_retrievalmethodtype_retrievalmethod_e_id`"/>
+		</many-to-one>
+		<many-to-one name="x509Data" entity-name="X509DataType" lazy="false" cascade="all" foreign-key="keyinfotype_x509data" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_x509datatype_x509data_e_id`"/>
+		</many-to-one>
+		<many-to-one name="pGPData" entity-name="PGPDataType" lazy="false" cascade="all" foreign-key="keyinfotype_pgpdata" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_pgpdatatype_pgpdata_e_id`"/>
+		</many-to-one>
+		<many-to-one name="sPKIData" entity-name="SPKIDataType" lazy="false" cascade="all" foreign-key="keyinfotype_spkidata" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_spkidatatype_spkidata_e_id`"/>
+		</many-to-one>
+		<property name="mgmtData" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_mgmtdata`"/>
+		</property>
+		<many-to-one name="any" entity-name="KeyInfoType_any" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="KeyInfoType_any" lazy="false" table="`keyinfotype_any`">
+		<meta attribute="featureMap" inherit="false">KeyInfoType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.KeyValueTypeImpl" entity-name="KeyValueType" abstract="false" lazy="false" table="`keyvaluetype`">
+		<meta attribute="eclassName" inherit="false">KeyValueType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`keyvaluetype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`keyvaluetype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`keyvaluetype_mixed_idx`"/>
+			<one-to-many entity-name="KeyValueType_mixed"/>
+		</list>
+	</class>
+	<class entity-name="KeyValueType_mixed" lazy="false" table="`keyvaluetype_mixed`">
+		<meta attribute="featureMap" inherit="false">KeyValueType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="dSAKeyValue" entity-name="DSAKeyValueType" lazy="false" cascade="all" foreign-key="keyvaluetype_dsakeyvalue" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_dsakeyvaluetype_dsakeyvalue_e_id`"/>
+		</many-to-one>
+		<many-to-one name="rSAKeyValue" entity-name="RSAKeyValueType" lazy="false" cascade="all" foreign-key="keyvaluetype_rsakeyvalue" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_rsakeyvaluetype_rsakeyvalue_e_id`"/>
+		</many-to-one>
+		<list name="any" table="`mixed_keyvaluetype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_keyvaluetype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_keyvaluetype_any_idx`"/>
+			<one-to-many entity-name="KeyValueType_any"/>
+		</list>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="KeyValueType_any" lazy="false" table="`keyvaluetype_any`">
+		<meta attribute="featureMap" inherit="false">KeyValueType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.ManifestTypeImpl" entity-name="ManifestType" abstract="false" lazy="false" table="`manifesttype`">
+		<meta attribute="eclassName" inherit="false">ManifestType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="reference" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="manifesttype_reference">
+				<column name="`manifesttype_reference_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`manifesttype_reference_idx`"/>
+			<one-to-many entity-name="ReferenceType"/>
+		</list>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.ObjectTypeImpl" entity-name="ObjectType" abstract="false" lazy="false" table="`objecttype`">
+		<meta attribute="eclassName" inherit="false">ObjectType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`objecttype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`objecttype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`objecttype_mixed_idx`"/>
+			<one-to-many entity-name="ObjectType_mixed"/>
+		</list>
+		<property name="encoding" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`encoding`"/>
+		</property>
+		<property name="mimeType" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mimetype`"/>
+		</property>
+	</class>
+	<class entity-name="ObjectType_mixed" lazy="false" table="`objecttype_mixed`">
+		<meta attribute="featureMap" inherit="false">ObjectType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="group" table="`mixed_objecttype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_objecttype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_objecttype_group_idx`"/>
+			<one-to-many entity-name="ObjectType_group"/>
+		</list>
+		<many-to-one name="any" entity-name="ObjectType_any" cascade="all" not-null="false"/>
+		<property name="encoding" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_encoding`"/>
+		</property>
+		<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="`mixed_id`"/>
+		</property>
+		<property name="mimeType" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_mimetype`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="ObjectType_group" lazy="false" table="`objecttype_group`">
+		<meta attribute="featureMap" inherit="false">ObjectType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="any" entity-name="ObjectType_any" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="ObjectType_any" lazy="false" table="`objecttype_any`">
+		<meta attribute="featureMap" inherit="false">ObjectType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.PGPDataTypeImpl" entity-name="PGPDataType" abstract="false" lazy="false" table="`pgpdatatype`">
+		<meta attribute="eclassName" inherit="false">PGPDataType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<array name="pGPKeyID" table="`pgpdatatype_pgpkeyid`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pgpdatatype_pgpkeyid_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`pgpdatatype_pgpkeyid_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="pGPKeyPacket" table="`pgpdatatype_pgpkeypacket`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pgpdatatype_pgpkeypacket_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`pgpdatatype_pgpkeypacket_idx`"/>
+			<element type="byte"/>
+		</array>
+		<list name="any" table="`pgpdatatype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pgpdatatype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`pgpdatatype_any_idx`"/>
+			<one-to-many entity-name="PGPDataType_any"/>
+		</list>
+		<array name="pGPKeyPacket1" table="`pgpdatatype_pgpkeypacket1`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pgpdatatype_pgpkeypacket1_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`pgpdatatype_pgpkeypacket1_idx`"/>
+			<element type="byte"/>
+		</array>
+		<list name="any1" table="`pgpdatatype_any1`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pgpdatatype_any1_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`pgpdatatype_any1_idx`"/>
+			<one-to-many entity-name="PGPDataType_any1"/>
+		</list>
+	</class>
+	<class entity-name="PGPDataType_any" lazy="false" table="`pgpdatatype_any`">
+		<meta attribute="featureMap" inherit="false">PGPDataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class entity-name="PGPDataType_any1" lazy="false" table="`pgpdatatype_any1`">
+		<meta attribute="featureMap" inherit="false">PGPDataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any1_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any1_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any1_type`"/>
+			<column not-null="false" unique="false" name="`any1_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.ReferenceTypeImpl" entity-name="ReferenceType" abstract="false" lazy="false" table="`referencetype`">
+		<meta attribute="eclassName" inherit="false">ReferenceType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<many-to-one name="transforms" entity-name="TransformsType" lazy="false" cascade="all" foreign-key="referencetype_transforms" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`transformstype_transforms_e_id`"/>
+		</many-to-one>
+		<many-to-one name="digestMethod" entity-name="DigestMethodType" lazy="false" cascade="all" foreign-key="referencetype_digestmethod" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`digestmethodtype_digestmethod_e_id`"/>
+		</many-to-one>
+		<array name="digestValue" table="`referencetype_digestvalue`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`referencetype_digestvalue_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`referencetype_digestvalue_idx`"/>
+			<element type="byte"/>
+		</array>
+		<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>
+		<property name="uRI" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`uri`"/>
+		</property>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.RetrievalMethodTypeImpl" entity-name="RetrievalMethodType" abstract="false" lazy="false" table="`retrievalmethodtype`">
+		<meta attribute="eclassName" inherit="false">RetrievalMethodType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="transforms" entity-name="TransformsType" lazy="false" cascade="all" foreign-key="retrievalmethodtype_transforms" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`transformstype_transforms_e_id`"/>
+		</many-to-one>
+		<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>
+		<property name="uRI" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`uri`"/>
+		</property>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.RSAKeyValueTypeImpl" entity-name="RSAKeyValueType" abstract="false" lazy="false" table="`rsakeyvaluetype`">
+		<meta attribute="eclassName" inherit="false">RSAKeyValueType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<array name="modulus" table="`rsakeyvaluetype_modulus`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`rsakeyvaluetype_modulus_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`rsakeyvaluetype_modulus_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="exponent" table="`rsakeyvaluetype_exponent`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`rsakeyvaluetype_exponent_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`rsakeyvaluetype_exponent_idx`"/>
+			<element type="byte"/>
+		</array>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignatureMethodTypeImpl" entity-name="SignatureMethodType" abstract="false" lazy="false" table="`signaturemethodtype`">
+		<meta attribute="eclassName" inherit="false">SignatureMethodType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`signaturemethodtype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`signaturemethodtype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`signaturemethodtype_mixed_idx`"/>
+			<one-to-many entity-name="SignatureMethodType_mixed"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`algorithm`"/>
+		</property>
+	</class>
+	<class entity-name="SignatureMethodType_mixed" lazy="false" table="`signaturemethodtype_mixed`">
+		<meta attribute="featureMap" inherit="false">SignatureMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="hMACOutputLength" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`mixed_hmacoutputlength`"/>
+		</property>
+		<list name="any" table="`mixed_signaturemethodtype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_signaturemethodtype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_signaturemethodtype_any_idx`"/>
+			<one-to-many entity-name="SignatureMethodType_any"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_algorithm`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="SignatureMethodType_any" lazy="false" table="`signaturemethodtype_any`">
+		<meta attribute="featureMap" inherit="false">SignatureMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignaturePropertiesTypeImpl" entity-name="SignaturePropertiesType" abstract="false" lazy="false" table="`signaturepropertiestype`">
+		<meta attribute="eclassName" inherit="false">SignaturePropertiesType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="signatureProperty" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="signaturepropertiestype_signatureproperty">
+				<column name="`signaturepropertiestype_signatureproperty_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`signaturepropertiestype_signatureproperty_idx`"/>
+			<one-to-many entity-name="SignaturePropertyType"/>
+		</list>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignaturePropertyTypeImpl" entity-name="SignaturePropertyType" abstract="false" lazy="false" table="`signaturepropertytype`">
+		<meta attribute="eclassName" inherit="false">SignaturePropertyType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`signaturepropertytype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`signaturepropertytype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`signaturepropertytype_mixed_idx`"/>
+			<one-to-many entity-name="SignaturePropertyType_mixed"/>
+		</list>
+		<property name="target" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`target`"/>
+		</property>
+	</class>
+	<class entity-name="SignaturePropertyType_mixed" lazy="false" table="`signaturepropertytype_mixed`">
+		<meta attribute="featureMap" inherit="false">SignaturePropertyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="group" table="`mixed_signaturepropertytype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_signaturepropertytype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_signaturepropertytype_group_idx`"/>
+			<one-to-many entity-name="SignaturePropertyType_group"/>
+		</list>
+		<many-to-one name="any" entity-name="SignaturePropertyType_any" cascade="all" 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="`mixed_id`"/>
+		</property>
+		<property name="target" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_target`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="SignaturePropertyType_group" lazy="false" table="`signaturepropertytype_group`">
+		<meta attribute="featureMap" inherit="false">SignaturePropertyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="any" entity-name="SignaturePropertyType_any" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="SignaturePropertyType_any" lazy="false" table="`signaturepropertytype_any`">
+		<meta attribute="featureMap" inherit="false">SignaturePropertyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignatureTypeImpl" entity-name="SignatureType" abstract="false" lazy="false" table="`signaturetype`">
+		<meta attribute="eclassName" inherit="false">SignatureType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<many-to-one name="signedInfo" entity-name="SignedInfoType" lazy="false" cascade="all" foreign-key="signaturetype_signedinfo" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`signedinfotype_signedinfo_e_id`"/>
+		</many-to-one>
+		<many-to-one name="signatureValue" entity-name="SignatureValueType" lazy="false" cascade="all" foreign-key="signaturetype_signaturevalue" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`signaturevaluetype_signaturevalue_e_id`"/>
+		</many-to-one>
+		<many-to-one name="keyInfo" entity-name="KeyInfoType" lazy="false" cascade="all" foreign-key="signaturetype_keyinfo" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`keyinfotype_keyinfo_id`"/>
+		</many-to-one>
+		<list name="object" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="signaturetype_object">
+				<column name="`signaturetype_object_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`signaturetype_object_idx`"/>
+			<one-to-many entity-name="ObjectType"/>
+		</list>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignatureValueTypeImpl" entity-name="SignatureValueType" abstract="false" lazy="false" table="`signaturevaluetype`">
+		<meta attribute="eclassName" inherit="false">SignatureValueType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<array name="value" table="`signaturevaluetype_value`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`signaturevaluetype_value_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`signaturevaluetype_value_idx`"/>
+			<element type="byte"/>
+		</array>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignedInfoTypeImpl" entity-name="SignedInfoType" abstract="false" lazy="false" table="`signedinfotype`">
+		<meta attribute="eclassName" inherit="false">SignedInfoType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<many-to-one name="canonicalizationMethod" entity-name="CanonicalizationMethodType" lazy="false" cascade="all" foreign-key="signedinfotype_canonicalizationmethod" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`canonicalizationmethodtype_canonicalizationmethod_e_id`"/>
+		</many-to-one>
+		<many-to-one name="signatureMethod" entity-name="SignatureMethodType" lazy="false" cascade="all" foreign-key="signedinfotype_signaturemethod" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`signaturemethodtype_signaturemethod_e_id`"/>
+		</many-to-one>
+		<list name="reference" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="signedinfotype_reference">
+				<column name="`signedinfotype_reference_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`signedinfotype_reference_idx`"/>
+			<one-to-many entity-name="ReferenceType"/>
+		</list>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SPKIDataTypeImpl" entity-name="SPKIDataType" abstract="false" lazy="false" table="`spkidatatype`">
+		<meta attribute="eclassName" inherit="false">SPKIDataType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="group" table="`spkidatatype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`spkidatatype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`spkidatatype_group_idx`"/>
+			<one-to-many entity-name="SPKIDataType_group"/>
+		</list>
+	</class>
+	<class entity-name="SPKIDataType_group" lazy="false" table="`spkidatatype_group`">
+		<meta attribute="featureMap" inherit="false">SPKIDataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="sPKISexp" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`group_spkisexp`"/>
+		</property>
+		<many-to-one name="any" entity-name="SPKIDataType_any" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="SPKIDataType_any" lazy="false" table="`spkidatatype_any`">
+		<meta attribute="featureMap" inherit="false">SPKIDataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.TransformsTypeImpl" entity-name="TransformsType" abstract="false" lazy="false" table="`transformstype`">
+		<meta attribute="eclassName" inherit="false">TransformsType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="transform" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="transformstype_transform">
+				<column name="`transformstype_transform_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`transformstype_transform_idx`"/>
+			<one-to-many entity-name="TransformType"/>
+		</list>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.TransformTypeImpl" entity-name="TransformType" abstract="false" lazy="false" table="`transformtype`">
+		<meta attribute="eclassName" inherit="false">TransformType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`transformtype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`transformtype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`transformtype_mixed_idx`"/>
+			<one-to-many entity-name="TransformType_mixed"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`algorithm`"/>
+		</property>
+	</class>
+	<class entity-name="TransformType_mixed" lazy="false" table="`transformtype_mixed`">
+		<meta attribute="featureMap" inherit="false">TransformType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="group" table="`mixed_transformtype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_transformtype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_transformtype_group_idx`"/>
+			<one-to-many entity-name="TransformType_group"/>
+		</list>
+		<many-to-one name="any" entity-name="TransformType_any" cascade="all" not-null="false"/>
+		<property name="xPath" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_xpath`"/>
+		</property>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_algorithm`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="TransformType_group" lazy="false" table="`transformtype_group`">
+		<meta attribute="featureMap" inherit="false">TransformType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="any" entity-name="TransformType_any" cascade="all" not-null="false"/>
+		<property name="xPath" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_xpath`"/>
+		</property>
+	</class>
+	<class entity-name="TransformType_any" lazy="false" table="`transformtype_any`">
+		<meta attribute="featureMap" inherit="false">TransformType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.X509DataTypeImpl" entity-name="X509DataType" abstract="false" lazy="false" table="`x509datatype`">
+		<meta attribute="eclassName" inherit="false">X509DataType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="group" table="`x509datatype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`x509datatype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`x509datatype_group_idx`"/>
+			<one-to-many entity-name="X509DataType_group"/>
+		</list>
+	</class>
+	<class entity-name="X509DataType_group" lazy="false" table="`x509datatype_group`">
+		<meta attribute="featureMap" inherit="false">X509DataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="x509IssuerSerial" entity-name="X509IssuerSerialType" lazy="false" cascade="all" foreign-key="x509datatype_x509issuerserial" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_x509issuerserialtype_x509issuerserial_e_id`"/>
+		</many-to-one>
+		<property name="x509SKI" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`group_x509ski`"/>
+		</property>
+		<property name="x509SubjectName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_x509subjectname`"/>
+		</property>
+		<property name="x509Certificate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`group_x509certificate`"/>
+		</property>
+		<property name="x509CRL" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`group_x509crl`"/>
+		</property>
+		<many-to-one name="any" entity-name="X509DataType_any" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="X509DataType_any" lazy="false" table="`x509datatype_any`">
+		<meta attribute="featureMap" inherit="false">X509DataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.X509IssuerSerialTypeImpl" entity-name="X509IssuerSerialType" abstract="false" lazy="false" table="`x509issuerserialtype`">
+		<meta attribute="eclassName" inherit="false">X509IssuerSerialType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="x509IssuerName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`x509issuername`"/>
+		</property>
+		<property name="x509SerialNumber" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
+			<column not-null="true" unique="false" name="`x509serialnumber`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a4dcb1058
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,1033 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.w3._2000._09.xmldsig.impl.CanonicalizationMethodTypeImpl" entity-name="CanonicalizationMethodType" abstract="false" lazy="false" table="`canonicalizationmethodtype`">
+		<meta attribute="eclassName" inherit="false">CanonicalizationMethodType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`canonicalizationmethodtype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`canonicalizationmethodtype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`canonicalizationmethodtype_mixed_idx`"/>
+			<one-to-many entity-name="CanonicalizationMethodType_mixed"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`algorithm`"/>
+		</property>
+	</class>
+	<class entity-name="CanonicalizationMethodType_mixed" lazy="false" table="`canonicalizationmethodtype_mixed`">
+		<meta attribute="featureMap" inherit="false">CanonicalizationMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="any" table="`mixed_canonicalizationmethodtype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_canonicalizationmethodtype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_canonicalizationmethodtype_any_idx`"/>
+			<one-to-many entity-name="CanonicalizationMethodType_any"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_algorithm`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="CanonicalizationMethodType_any" lazy="false" table="`canonicalizationmethodtype_any`">
+		<meta attribute="featureMap" inherit="false">CanonicalizationMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.DigestMethodTypeImpl" entity-name="DigestMethodType" abstract="false" lazy="false" table="`digestmethodtype`">
+		<meta attribute="eclassName" inherit="false">DigestMethodType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`digestmethodtype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`digestmethodtype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`digestmethodtype_mixed_idx`"/>
+			<one-to-many entity-name="DigestMethodType_mixed"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`algorithm`"/>
+		</property>
+	</class>
+	<class entity-name="DigestMethodType_mixed" lazy="false" table="`digestmethodtype_mixed`">
+		<meta attribute="featureMap" inherit="false">DigestMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="any" table="`mixed_digestmethodtype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_digestmethodtype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_digestmethodtype_any_idx`"/>
+			<one-to-many entity-name="DigestMethodType_any"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_algorithm`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="DigestMethodType_any" lazy="false" table="`digestmethodtype_any`">
+		<meta attribute="featureMap" inherit="false">DigestMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.DSAKeyValueTypeImpl" entity-name="DSAKeyValueType" abstract="false" lazy="false" table="`dsakeyvaluetype`">
+		<meta attribute="eclassName" inherit="false">DSAKeyValueType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<array name="p" table="`dsakeyvaluetype_p`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_p_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_p_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="q" table="`dsakeyvaluetype_q`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_q_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_q_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="g" table="`dsakeyvaluetype_g`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_g_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_g_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="y" table="`dsakeyvaluetype_y`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_y_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_y_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="j" table="`dsakeyvaluetype_j`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_j_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_j_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="seed" table="`dsakeyvaluetype_seed`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_seed_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_seed_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="pgenCounter" table="`dsakeyvaluetype_pgencounter`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`dsakeyvaluetype_pgencounter_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`dsakeyvaluetype_pgencounter_idx`"/>
+			<element type="byte"/>
+		</array>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.KeyInfoTypeImpl" entity-name="KeyInfoType" abstract="false" lazy="false" table="`keyinfotype`">
+		<meta attribute="eclassName" inherit="false">KeyInfoType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`keyinfotype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`keyinfotype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`keyinfotype_mixed_idx`"/>
+			<one-to-many entity-name="KeyInfoType_mixed"/>
+		</list>
+	</class>
+	<class entity-name="KeyInfoType_mixed" lazy="false" table="`keyinfotype_mixed`">
+		<meta attribute="featureMap" inherit="false">KeyInfoType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="group" table="`mixed_keyinfotype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_keyinfotype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_keyinfotype_group_idx`"/>
+			<one-to-many entity-name="KeyInfoType_group"/>
+		</list>
+		<property name="keyName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_keyname`"/>
+		</property>
+		<many-to-one name="keyValue" entity-name="KeyValueType" lazy="false" cascade="all" foreign-key="keyinfotype_keyvalue" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_keyvaluetype_keyvalue_e_id`"/>
+		</many-to-one>
+		<many-to-one name="retrievalMethod" entity-name="RetrievalMethodType" lazy="false" cascade="all" foreign-key="keyinfotype_retrievalmethod" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_retrievalmethodtype_retrievalmethod_e_id`"/>
+		</many-to-one>
+		<many-to-one name="x509Data" entity-name="X509DataType" lazy="false" cascade="all" foreign-key="keyinfotype_x509data" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_x509datatype_x509data_e_id`"/>
+		</many-to-one>
+		<many-to-one name="pGPData" entity-name="PGPDataType" lazy="false" cascade="all" foreign-key="keyinfotype_pgpdata" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_pgpdatatype_pgpdata_e_id`"/>
+		</many-to-one>
+		<many-to-one name="sPKIData" entity-name="SPKIDataType" lazy="false" cascade="all" foreign-key="keyinfotype_spkidata" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_spkidatatype_spkidata_e_id`"/>
+		</many-to-one>
+		<property name="mgmtData" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_mgmtdata`"/>
+		</property>
+		<many-to-one name="any" entity-name="KeyInfoType_any" cascade="all" 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="`mixed_id`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="KeyInfoType_group" lazy="false" table="`keyinfotype_group`">
+		<meta attribute="featureMap" inherit="false">KeyInfoType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="keyName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_keyname`"/>
+		</property>
+		<many-to-one name="keyValue" entity-name="KeyValueType" lazy="false" cascade="all" foreign-key="keyinfotype_keyvalue" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_keyvaluetype_keyvalue_e_id`"/>
+		</many-to-one>
+		<many-to-one name="retrievalMethod" entity-name="RetrievalMethodType" lazy="false" cascade="all" foreign-key="keyinfotype_retrievalmethod" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_retrievalmethodtype_retrievalmethod_e_id`"/>
+		</many-to-one>
+		<many-to-one name="x509Data" entity-name="X509DataType" lazy="false" cascade="all" foreign-key="keyinfotype_x509data" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_x509datatype_x509data_e_id`"/>
+		</many-to-one>
+		<many-to-one name="pGPData" entity-name="PGPDataType" lazy="false" cascade="all" foreign-key="keyinfotype_pgpdata" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_pgpdatatype_pgpdata_e_id`"/>
+		</many-to-one>
+		<many-to-one name="sPKIData" entity-name="SPKIDataType" lazy="false" cascade="all" foreign-key="keyinfotype_spkidata" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_spkidatatype_spkidata_e_id`"/>
+		</many-to-one>
+		<property name="mgmtData" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_mgmtdata`"/>
+		</property>
+		<many-to-one name="any" entity-name="KeyInfoType_any" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="KeyInfoType_any" lazy="false" table="`keyinfotype_any`">
+		<meta attribute="featureMap" inherit="false">KeyInfoType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.KeyValueTypeImpl" entity-name="KeyValueType" abstract="false" lazy="false" table="`keyvaluetype`">
+		<meta attribute="eclassName" inherit="false">KeyValueType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`keyvaluetype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`keyvaluetype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`keyvaluetype_mixed_idx`"/>
+			<one-to-many entity-name="KeyValueType_mixed"/>
+		</list>
+	</class>
+	<class entity-name="KeyValueType_mixed" lazy="false" table="`keyvaluetype_mixed`">
+		<meta attribute="featureMap" inherit="false">KeyValueType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="dSAKeyValue" entity-name="DSAKeyValueType" lazy="false" cascade="all" foreign-key="keyvaluetype_dsakeyvalue" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_dsakeyvaluetype_dsakeyvalue_e_id`"/>
+		</many-to-one>
+		<many-to-one name="rSAKeyValue" entity-name="RSAKeyValueType" lazy="false" cascade="all" foreign-key="keyvaluetype_rsakeyvalue" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_rsakeyvaluetype_rsakeyvalue_e_id`"/>
+		</many-to-one>
+		<list name="any" table="`mixed_keyvaluetype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_keyvaluetype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_keyvaluetype_any_idx`"/>
+			<one-to-many entity-name="KeyValueType_any"/>
+		</list>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="KeyValueType_any" lazy="false" table="`keyvaluetype_any`">
+		<meta attribute="featureMap" inherit="false">KeyValueType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.ManifestTypeImpl" entity-name="ManifestType" abstract="false" lazy="false" table="`manifesttype`">
+		<meta attribute="eclassName" inherit="false">ManifestType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="reference" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="manifesttype_reference">
+				<column name="`manifesttype_reference_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`manifesttype_reference_idx`"/>
+			<one-to-many entity-name="ReferenceType"/>
+		</list>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.ObjectTypeImpl" entity-name="ObjectType" abstract="false" lazy="false" table="`objecttype`">
+		<meta attribute="eclassName" inherit="false">ObjectType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`objecttype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`objecttype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`objecttype_mixed_idx`"/>
+			<one-to-many entity-name="ObjectType_mixed"/>
+		</list>
+		<property name="encoding" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`encoding`"/>
+		</property>
+		<property name="mimeType" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mimetype`"/>
+		</property>
+	</class>
+	<class entity-name="ObjectType_mixed" lazy="false" table="`objecttype_mixed`">
+		<meta attribute="featureMap" inherit="false">ObjectType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="group" table="`mixed_objecttype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_objecttype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_objecttype_group_idx`"/>
+			<one-to-many entity-name="ObjectType_group"/>
+		</list>
+		<many-to-one name="any" entity-name="ObjectType_any" cascade="all" not-null="false"/>
+		<property name="encoding" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_encoding`"/>
+		</property>
+		<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="`mixed_id`"/>
+		</property>
+		<property name="mimeType" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_mimetype`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="ObjectType_group" lazy="false" table="`objecttype_group`">
+		<meta attribute="featureMap" inherit="false">ObjectType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="any" entity-name="ObjectType_any" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="ObjectType_any" lazy="false" table="`objecttype_any`">
+		<meta attribute="featureMap" inherit="false">ObjectType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.PGPDataTypeImpl" entity-name="PGPDataType" abstract="false" lazy="false" table="`pgpdatatype`">
+		<meta attribute="eclassName" inherit="false">PGPDataType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<array name="pGPKeyID" table="`pgpdatatype_pgpkeyid`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pgpdatatype_pgpkeyid_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`pgpdatatype_pgpkeyid_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="pGPKeyPacket" table="`pgpdatatype_pgpkeypacket`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pgpdatatype_pgpkeypacket_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`pgpdatatype_pgpkeypacket_idx`"/>
+			<element type="byte"/>
+		</array>
+		<list name="any" table="`pgpdatatype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pgpdatatype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`pgpdatatype_any_idx`"/>
+			<one-to-many entity-name="PGPDataType_any"/>
+		</list>
+		<array name="pGPKeyPacket1" table="`pgpdatatype_pgpkeypacket1`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pgpdatatype_pgpkeypacket1_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`pgpdatatype_pgpkeypacket1_idx`"/>
+			<element type="byte"/>
+		</array>
+		<list name="any1" table="`pgpdatatype_any1`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pgpdatatype_any1_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`pgpdatatype_any1_idx`"/>
+			<one-to-many entity-name="PGPDataType_any1"/>
+		</list>
+	</class>
+	<class entity-name="PGPDataType_any" lazy="false" table="`pgpdatatype_any`">
+		<meta attribute="featureMap" inherit="false">PGPDataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class entity-name="PGPDataType_any1" lazy="false" table="`pgpdatatype_any1`">
+		<meta attribute="featureMap" inherit="false">PGPDataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any1_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any1_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any1_type`"/>
+			<column not-null="false" unique="false" name="`any1_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.ReferenceTypeImpl" entity-name="ReferenceType" abstract="false" lazy="false" table="`referencetype`">
+		<meta attribute="eclassName" inherit="false">ReferenceType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<many-to-one name="transforms" entity-name="TransformsType" lazy="false" cascade="all" foreign-key="referencetype_transforms" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`transformstype_transforms_e_id`"/>
+		</many-to-one>
+		<many-to-one name="digestMethod" entity-name="DigestMethodType" lazy="false" cascade="all" foreign-key="referencetype_digestmethod" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`digestmethodtype_digestmethod_e_id`"/>
+		</many-to-one>
+		<array name="digestValue" table="`referencetype_digestvalue`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`referencetype_digestvalue_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`referencetype_digestvalue_idx`"/>
+			<element type="byte"/>
+		</array>
+		<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>
+		<property name="uRI" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`uri`"/>
+		</property>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.RetrievalMethodTypeImpl" entity-name="RetrievalMethodType" abstract="false" lazy="false" table="`retrievalmethodtype`">
+		<meta attribute="eclassName" inherit="false">RetrievalMethodType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="transforms" entity-name="TransformsType" lazy="false" cascade="all" foreign-key="retrievalmethodtype_transforms" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`transformstype_transforms_e_id`"/>
+		</many-to-one>
+		<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>
+		<property name="uRI" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`uri`"/>
+		</property>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.RSAKeyValueTypeImpl" entity-name="RSAKeyValueType" abstract="false" lazy="false" table="`rsakeyvaluetype`">
+		<meta attribute="eclassName" inherit="false">RSAKeyValueType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<array name="modulus" table="`rsakeyvaluetype_modulus`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`rsakeyvaluetype_modulus_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`rsakeyvaluetype_modulus_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="exponent" table="`rsakeyvaluetype_exponent`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`rsakeyvaluetype_exponent_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`rsakeyvaluetype_exponent_idx`"/>
+			<element type="byte"/>
+		</array>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignatureMethodTypeImpl" entity-name="SignatureMethodType" abstract="false" lazy="false" table="`signaturemethodtype`">
+		<meta attribute="eclassName" inherit="false">SignatureMethodType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`signaturemethodtype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`signaturemethodtype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`signaturemethodtype_mixed_idx`"/>
+			<one-to-many entity-name="SignatureMethodType_mixed"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`algorithm`"/>
+		</property>
+	</class>
+	<class entity-name="SignatureMethodType_mixed" lazy="false" table="`signaturemethodtype_mixed`">
+		<meta attribute="featureMap" inherit="false">SignatureMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="hMACOutputLength" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`mixed_hmacoutputlength`"/>
+		</property>
+		<list name="any" table="`mixed_signaturemethodtype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_signaturemethodtype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_signaturemethodtype_any_idx`"/>
+			<one-to-many entity-name="SignatureMethodType_any"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_algorithm`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="SignatureMethodType_any" lazy="false" table="`signaturemethodtype_any`">
+		<meta attribute="featureMap" inherit="false">SignatureMethodType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignaturePropertiesTypeImpl" entity-name="SignaturePropertiesType" abstract="false" lazy="false" table="`signaturepropertiestype`">
+		<meta attribute="eclassName" inherit="false">SignaturePropertiesType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="signatureProperty" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="signaturepropertiestype_signatureproperty">
+				<column name="`signaturepropertiestype_signatureproperty_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`signaturepropertiestype_signatureproperty_idx`"/>
+			<one-to-many entity-name="SignaturePropertyType"/>
+		</list>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignaturePropertyTypeImpl" entity-name="SignaturePropertyType" abstract="false" lazy="false" table="`signaturepropertytype`">
+		<meta attribute="eclassName" inherit="false">SignaturePropertyType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`signaturepropertytype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`signaturepropertytype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`signaturepropertytype_mixed_idx`"/>
+			<one-to-many entity-name="SignaturePropertyType_mixed"/>
+		</list>
+		<property name="target" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`target`"/>
+		</property>
+	</class>
+	<class entity-name="SignaturePropertyType_mixed" lazy="false" table="`signaturepropertytype_mixed`">
+		<meta attribute="featureMap" inherit="false">SignaturePropertyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="group" table="`mixed_signaturepropertytype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_signaturepropertytype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_signaturepropertytype_group_idx`"/>
+			<one-to-many entity-name="SignaturePropertyType_group"/>
+		</list>
+		<many-to-one name="any" entity-name="SignaturePropertyType_any" cascade="all" 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="`mixed_id`"/>
+		</property>
+		<property name="target" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_target`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="SignaturePropertyType_group" lazy="false" table="`signaturepropertytype_group`">
+		<meta attribute="featureMap" inherit="false">SignaturePropertyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="any" entity-name="SignaturePropertyType_any" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="SignaturePropertyType_any" lazy="false" table="`signaturepropertytype_any`">
+		<meta attribute="featureMap" inherit="false">SignaturePropertyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignatureTypeImpl" entity-name="SignatureType" abstract="false" lazy="false" table="`signaturetype`">
+		<meta attribute="eclassName" inherit="false">SignatureType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<many-to-one name="signedInfo" entity-name="SignedInfoType" lazy="false" cascade="all" foreign-key="signaturetype_signedinfo" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`signedinfotype_signedinfo_e_id`"/>
+		</many-to-one>
+		<many-to-one name="signatureValue" entity-name="SignatureValueType" lazy="false" cascade="all" foreign-key="signaturetype_signaturevalue" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`signaturevaluetype_signaturevalue_e_id`"/>
+		</many-to-one>
+		<many-to-one name="keyInfo" entity-name="KeyInfoType" lazy="false" cascade="all" foreign-key="signaturetype_keyinfo" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`keyinfotype_keyinfo_id`"/>
+		</many-to-one>
+		<list name="object" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="signaturetype_object">
+				<column name="`signaturetype_object_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`signaturetype_object_idx`"/>
+			<one-to-many entity-name="ObjectType"/>
+		</list>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignatureValueTypeImpl" entity-name="SignatureValueType" abstract="false" lazy="false" table="`signaturevaluetype`">
+		<meta attribute="eclassName" inherit="false">SignatureValueType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<array name="value" table="`signaturevaluetype_value`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`signaturevaluetype_value_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`signaturevaluetype_value_idx`"/>
+			<element type="byte"/>
+		</array>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SignedInfoTypeImpl" entity-name="SignedInfoType" abstract="false" lazy="false" table="`signedinfotype`">
+		<meta attribute="eclassName" inherit="false">SignedInfoType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<many-to-one name="canonicalizationMethod" entity-name="CanonicalizationMethodType" lazy="false" cascade="all" foreign-key="signedinfotype_canonicalizationmethod" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`canonicalizationmethodtype_canonicalizationmethod_e_id`"/>
+		</many-to-one>
+		<many-to-one name="signatureMethod" entity-name="SignatureMethodType" lazy="false" cascade="all" foreign-key="signedinfotype_signaturemethod" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`signaturemethodtype_signaturemethod_e_id`"/>
+		</many-to-one>
+		<list name="reference" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="signedinfotype_reference">
+				<column name="`signedinfotype_reference_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`signedinfotype_reference_idx`"/>
+			<one-to-many entity-name="ReferenceType"/>
+		</list>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.SPKIDataTypeImpl" entity-name="SPKIDataType" abstract="false" lazy="false" table="`spkidatatype`">
+		<meta attribute="eclassName" inherit="false">SPKIDataType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="group" table="`spkidatatype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`spkidatatype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`spkidatatype_group_idx`"/>
+			<one-to-many entity-name="SPKIDataType_group"/>
+		</list>
+	</class>
+	<class entity-name="SPKIDataType_group" lazy="false" table="`spkidatatype_group`">
+		<meta attribute="featureMap" inherit="false">SPKIDataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="sPKISexp" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`group_spkisexp`"/>
+		</property>
+		<many-to-one name="any" entity-name="SPKIDataType_any" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="SPKIDataType_any" lazy="false" table="`spkidatatype_any`">
+		<meta attribute="featureMap" inherit="false">SPKIDataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.TransformsTypeImpl" entity-name="TransformsType" abstract="false" lazy="false" table="`transformstype`">
+		<meta attribute="eclassName" inherit="false">TransformsType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="transform" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="transformstype_transform">
+				<column name="`transformstype_transform_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`transformstype_transform_idx`"/>
+			<one-to-many entity-name="TransformType"/>
+		</list>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.TransformTypeImpl" entity-name="TransformType" abstract="false" lazy="false" table="`transformtype`">
+		<meta attribute="eclassName" inherit="false">TransformType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`transformtype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`transformtype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`transformtype_mixed_idx`"/>
+			<one-to-many entity-name="TransformType_mixed"/>
+		</list>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`algorithm`"/>
+		</property>
+	</class>
+	<class entity-name="TransformType_mixed" lazy="false" table="`transformtype_mixed`">
+		<meta attribute="featureMap" inherit="false">TransformType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="group" table="`mixed_transformtype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_transformtype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_transformtype_group_idx`"/>
+			<one-to-many entity-name="TransformType_group"/>
+		</list>
+		<many-to-one name="any" entity-name="TransformType_any" cascade="all" not-null="false"/>
+		<property name="xPath" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_xpath`"/>
+		</property>
+		<property name="algorithm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_algorithm`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="TransformType_group" lazy="false" table="`transformtype_group`">
+		<meta attribute="featureMap" inherit="false">TransformType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="any" entity-name="TransformType_any" cascade="all" not-null="false"/>
+		<property name="xPath" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_xpath`"/>
+		</property>
+	</class>
+	<class entity-name="TransformType_any" lazy="false" table="`transformtype_any`">
+		<meta attribute="featureMap" inherit="false">TransformType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.X509DataTypeImpl" entity-name="X509DataType" abstract="false" lazy="false" table="`x509datatype`">
+		<meta attribute="eclassName" inherit="false">X509DataType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="group" table="`x509datatype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`x509datatype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`x509datatype_group_idx`"/>
+			<one-to-many entity-name="X509DataType_group"/>
+		</list>
+	</class>
+	<class entity-name="X509DataType_group" lazy="false" table="`x509datatype_group`">
+		<meta attribute="featureMap" inherit="false">X509DataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="x509IssuerSerial" entity-name="X509IssuerSerialType" lazy="false" cascade="all" foreign-key="x509datatype_x509issuerserial" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_x509issuerserialtype_x509issuerserial_e_id`"/>
+		</many-to-one>
+		<property name="x509SKI" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`group_x509ski`"/>
+		</property>
+		<property name="x509SubjectName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_x509subjectname`"/>
+		</property>
+		<property name="x509Certificate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`group_x509certificate`"/>
+		</property>
+		<property name="x509CRL" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`group_x509crl`"/>
+		</property>
+		<many-to-one name="any" entity-name="X509DataType_any" cascade="all" not-null="false"/>
+	</class>
+	<class entity-name="X509DataType_any" lazy="false" table="`x509datatype_any`">
+		<meta attribute="featureMap" inherit="false">X509DataType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.w3._2000._09.xmldsig.impl.X509IssuerSerialTypeImpl" entity-name="X509IssuerSerialType" abstract="false" lazy="false" table="`x509issuerserialtype`">
+		<meta attribute="eclassName" inherit="false">X509IssuerSerialType</meta>
+		<meta attribute="epackage" inherit="false">http://www.w3.org/2000/09/xmldsig#</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="x509IssuerName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`x509issuername`"/>
+		</property>
+		<property name="x509SerialNumber" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
+			<column not-null="true" unique="false" name="`x509serialnumber`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz281730Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz281730Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1d3bad682
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz281730Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,95 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.issues.library.Book" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.library.Library" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.library.Writer" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz281730Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz281730Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..325fe93a8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz281730Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,86 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.issues.library.Book" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.library.Library" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.library.Writer" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz281730Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz281730Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..325fe93a8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz281730Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,86 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.issues.library.Book" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.library.Library" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.library.Writer" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz282414Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz282414Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2851f469b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz282414Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,50 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz282414.impl.BarImpl" entity-name="Bar" abstract="false" lazy="false" discriminator-value="Bar" table="`bar_table`">
+		<meta attribute="eclassName">Bar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz282414</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 type="string">
+			<column name="dtype" index="BAR_TABLEdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<component name="barKey" class="org.eclipse.emf.teneo.samples.issues.bz282414.impl.BarKeyImpl">
+			<property name="classId" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`clas_id`"/>
+			</property>
+			<property name="groupId" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`grp_id`"/>
+			</property>
+		</component>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz282414.impl.FooImpl" entity-name="Foo" abstract="false" lazy="false" discriminator-value="Foo" table="`foo_table`">
+		<meta attribute="eclassName">Foo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz282414</meta>
+		<id name="dnmSK" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`dnm_sk`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="FOO_TABLEdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<bag name="bagOfBars" lazy="true" cascade="all,delete-orphan">
+			<key update="true" property-ref="clientId" foreign-key="foo_bagofbars">
+				<column name="`grp_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Bar"/>
+		</bag>
+		<property name="clientId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`cli_id`" length="8"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz282414Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz282414Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0ce11578f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz282414Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,46 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz282414.impl.BarImpl" entity-name="Bar" abstract="false" lazy="false" table="`bar_table`">
+		<meta attribute="eclassName" inherit="false">Bar</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz282414</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<component name="barKey" class="org.eclipse.emf.teneo.samples.issues.bz282414.impl.BarKeyImpl">
+			<meta attribute="eclassName" inherit="false">BarKey</meta>
+			<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz282414</meta>
+			<property name="classId" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`clas_id`"/>
+			</property>
+			<property name="groupId" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`grp_id`"/>
+			</property>
+		</component>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz282414.impl.FooImpl" entity-name="Foo" abstract="false" lazy="false" table="`foo_table`">
+		<meta attribute="eclassName" inherit="false">Foo</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz282414</meta>
+		<id name="dnmSK" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`dnm_sk`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<bag name="bagOfBars" lazy="true" cascade="all,delete-orphan">
+			<key update="true" property-ref="clientId" foreign-key="foo_bagofbars">
+				<column name="`grp_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Bar"/>
+		</bag>
+		<property name="clientId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`cli_id`" length="8"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz282414Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz282414Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0ce11578f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz282414Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,46 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz282414.impl.BarImpl" entity-name="Bar" abstract="false" lazy="false" table="`bar_table`">
+		<meta attribute="eclassName" inherit="false">Bar</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz282414</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<component name="barKey" class="org.eclipse.emf.teneo.samples.issues.bz282414.impl.BarKeyImpl">
+			<meta attribute="eclassName" inherit="false">BarKey</meta>
+			<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz282414</meta>
+			<property name="classId" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`clas_id`"/>
+			</property>
+			<property name="groupId" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`grp_id`"/>
+			</property>
+		</component>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz282414.impl.FooImpl" entity-name="Foo" abstract="false" lazy="false" table="`foo_table`">
+		<meta attribute="eclassName" inherit="false">Foo</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz282414</meta>
+		<id name="dnmSK" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`dnm_sk`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<bag name="bagOfBars" lazy="true" cascade="all,delete-orphan">
+			<key update="true" property-ref="clientId" foreign-key="foo_bagofbars">
+				<column name="`grp_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Bar"/>
+		</bag>
+		<property name="clientId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`cli_id`" length="8"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz284859Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz284859Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..677848f55
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz284859Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,35 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz284859.impl.BarImpl" entity-name="Bar" abstract="false" lazy="false" discriminator-value="Bar" table="`bar`">
+		<meta attribute="eclassName">Bar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz284859</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bardtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz284859.impl.FooImpl" entity-name="Foo" abstract="false" lazy="false" discriminator-value="Foo" table="`foo`">
+		<meta attribute="eclassName">Foo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz284859</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="foodtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.bz284859.impl.BarDerivedImpl" entity-name="BarDerived" abstract="false" lazy="false" extends="Bar" discriminator-value="BarDerived">
+		<meta attribute="eclassName">BarDerived</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz284859</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz284859Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz284859Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c237defa9
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz284859Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,32 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz284859.impl.BarImpl" entity-name="Bar" abstract="false" lazy="false" table="`bar`">
+		<meta attribute="eclassName" inherit="false">Bar</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz284859</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz284859.impl.FooImpl" entity-name="Foo" abstract="false" lazy="false" table="`foo`">
+		<meta attribute="eclassName" inherit="false">Foo</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz284859</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.bz284859.impl.BarDerivedImpl" entity-name="BarDerived" abstract="false" lazy="false" extends="Bar" table="`barderived`">
+		<meta attribute="eclassName" inherit="false">BarDerived</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz284859</meta>
+		<key>
+			<column name="`bar_name`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz284859Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz284859Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c237defa9
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz284859Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,32 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz284859.impl.BarImpl" entity-name="Bar" abstract="false" lazy="false" table="`bar`">
+		<meta attribute="eclassName" inherit="false">Bar</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz284859</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz284859.impl.FooImpl" entity-name="Foo" abstract="false" lazy="false" table="`foo`">
+		<meta attribute="eclassName" inherit="false">Foo</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz284859</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.bz284859.impl.BarDerivedImpl" entity-name="BarDerived" abstract="false" lazy="false" extends="Bar" table="`barderived`">
+		<meta attribute="eclassName" inherit="false">BarDerived</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz284859</meta>
+		<key>
+			<column name="`bar_name`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz288963Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz288963Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d95609dbe
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz288963Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="bz288963.BooktypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</param>
+		<param name="edatatype">BooktypeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz288963.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="citation" entity-name="Book" lazy="false" cascade="all" foreign-key="book_citation" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_citation_e_id`"/>
+		</many-to-one>
+		<list name="paralist" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_paralist">
+				<column name="`book_paralist_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_paralist_idx`"/>
+			<one-to-many entity-name="Paragraph"/>
+		</list>
+		<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>
+		<property name="selfdef" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`selfdef`"/>
+		</property>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz288963.Booktype</param>
+				<param name="eclassifier">Booktype</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</param>
+			</type>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz288963.impl.ParagraphImpl" entity-name="Paragraph" abstract="false" lazy="false" discriminator-value="Paragraph" table="`paragraph`">
+		<meta attribute="eclassName">Paragraph</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</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 type="string">
+			<column name="dtype" index="paragraphdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="number" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`number`"/>
+		</property>
+		<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>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.bz288963.impl.FootnoteImpl" entity-name="Footnote" abstract="false" lazy="false" extends="Paragraph" discriminator-value="Footnote">
+		<meta attribute="eclassName">Footnote</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</meta>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.bz288963.impl.IndentedparaImpl" entity-name="Indentedpara" abstract="false" lazy="false" extends="Paragraph" discriminator-value="Indentedpara">
+		<meta attribute="eclassName">Indentedpara</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</meta>
+		<property name="indentSpace" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`indentspace`"/>
+		</property>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz288963Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz288963Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4f9777784
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz288963Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="bz288963.BooktypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</param>
+		<param name="edatatype">BooktypeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz288963.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="citation" entity-name="Book" lazy="false" cascade="all" foreign-key="book_citation" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_citation_e_id`"/>
+		</many-to-one>
+		<list name="paralist" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_paralist">
+				<column name="`book_paralist_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_paralist_idx`"/>
+			<one-to-many entity-name="Paragraph"/>
+		</list>
+		<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>
+		<property name="selfdef" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`selfdef`"/>
+		</property>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz288963.Booktype</param>
+				<param name="eclassifier">Booktype</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</param>
+			</type>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz288963.impl.ParagraphImpl" entity-name="Paragraph" abstract="false" lazy="false" table="`paragraph`">
+		<meta attribute="eclassName" inherit="false">Paragraph</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="number" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`number`"/>
+		</property>
+		<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>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.bz288963.impl.FootnoteImpl" entity-name="Footnote" abstract="false" lazy="false" extends="Paragraph" table="`footnote`">
+		<meta attribute="eclassName" inherit="false">Footnote</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</meta>
+		<key>
+			<column name="`paragraph_e_id`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.bz288963.impl.IndentedparaImpl" entity-name="Indentedpara" abstract="false" lazy="false" extends="Paragraph" table="`indentedpara`">
+		<meta attribute="eclassName" inherit="false">Indentedpara</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</meta>
+		<key>
+			<column name="`paragraph_e_id`"/>
+		</key>
+		<property name="indentSpace" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`indentspace`"/>
+		</property>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz288963Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz288963Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4f9777784
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz288963Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="bz288963.BooktypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</param>
+		<param name="edatatype">BooktypeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz288963.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="citation" entity-name="Book" lazy="false" cascade="all" foreign-key="book_citation" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_citation_e_id`"/>
+		</many-to-one>
+		<list name="paralist" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_paralist">
+				<column name="`book_paralist_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_paralist_idx`"/>
+			<one-to-many entity-name="Paragraph"/>
+		</list>
+		<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>
+		<property name="selfdef" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`selfdef`"/>
+		</property>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz288963.Booktype</param>
+				<param name="eclassifier">Booktype</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</param>
+			</type>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz288963.impl.ParagraphImpl" entity-name="Paragraph" abstract="false" lazy="false" table="`paragraph`">
+		<meta attribute="eclassName" inherit="false">Paragraph</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="number" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`number`"/>
+		</property>
+		<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>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.bz288963.impl.FootnoteImpl" entity-name="Footnote" abstract="false" lazy="false" extends="Paragraph" table="`footnote`">
+		<meta attribute="eclassName" inherit="false">Footnote</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</meta>
+		<key>
+			<column name="`paragraph_e_id`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.bz288963.impl.IndentedparaImpl" entity-name="Indentedpara" abstract="false" lazy="false" extends="Paragraph" table="`indentedpara`">
+		<meta attribute="eclassName" inherit="false">Indentedpara</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz288963</meta>
+		<key>
+			<column name="`paragraph_e_id`"/>
+		</key>
+		<property name="indentSpace" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`indentspace`"/>
+		</property>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1a2a59500
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,129 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" discriminator-value="Book" table="`book`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Book">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz242995.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http:///org/eclipse/example/library.ecore</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" discriminator-value="Library" table="`library`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Library">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" discriminator-value="Writer" table="`writer`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Writer">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.OneTimeWonderImpl" entity-name="OneTimeWonder" abstract="false" lazy="true" discriminator-value="OneTimeWonder" table="`onetimewonder`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.OneTimeWonder">
+		<meta attribute="eclassName">OneTimeWonder</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="foreign">
+				<param name="property">theAuthor</param>
+			</generator>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="onetimewonderdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="true" discriminator-value="Author" table="`author`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Author">
+		<meta attribute="eclassName">Author</meta>
+		<meta attribute="epackage">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="authordtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theBook" entity-name="OneTimeWonder" cascade="merge,persist,save-update,lock,refresh" lazy="proxy"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f4fce51d3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,114 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" table="`book`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Book">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz242995.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http:///org/eclipse/example/library.ecore</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" table="`library`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Library">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" table="`writer`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Writer">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.OneTimeWonderImpl" entity-name="OneTimeWonder" abstract="false" lazy="true" table="`onetimewonder`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.OneTimeWonder">
+		<meta attribute="eclassName" inherit="false">OneTimeWonder</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="foreign">
+				<param name="property">theAuthor</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="true" table="`author`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Author">
+		<meta attribute="eclassName" inherit="false">Author</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theBook" entity-name="OneTimeWonder" cascade="merge,persist,save-update,lock,refresh" lazy="proxy"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f4fce51d3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,114 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.BookImpl" entity-name="Book" abstract="false" lazy="true" table="`book`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Book">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz242995.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http:///org/eclipse/example/library.ecore</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="true" table="`library`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Library">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="true" table="`writer`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Writer">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.OneTimeWonderImpl" entity-name="OneTimeWonder" abstract="false" lazy="true" table="`onetimewonder`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.OneTimeWonder">
+		<meta attribute="eclassName" inherit="false">OneTimeWonder</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="foreign">
+				<param name="property">theAuthor</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="true" table="`author`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Author">
+		<meta attribute="eclassName" inherit="false">Author</meta>
+		<meta attribute="epackage" inherit="false">http:///org/eclipse/example/library.ecore</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="Name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<one-to-one name="theBook" entity-name="OneTimeWonder" cascade="merge,persist,save-update,lock,refresh" lazy="proxy"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292151Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292151Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0ca2934b2
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292151Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,33 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz292151.impl.BaseImpl" entity-name="Base" abstract="false" lazy="true" discriminator-value="Base" table="`base`" proxy="org.eclipse.emf.teneo.samples.issues.bz292151.Base">
+		<meta attribute="eclassName">Base</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz292151</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 type="string">
+			<column name="dtype" index="basedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.bz292151.impl.Sub1Impl" entity-name="Sub1" abstract="false" lazy="true" extends="Base" discriminator-value="Sub1" proxy="org.eclipse.emf.teneo.samples.issues.bz292151.Sub1">
+		<meta attribute="eclassName">Sub1</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz292151</meta>
+		<property name="a1" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`a1`"/>
+		</property>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.bz292151.impl.Sub2Impl" entity-name="Sub2" abstract="false" lazy="true" extends="Base" discriminator-value="Sub2" proxy="org.eclipse.emf.teneo.samples.issues.bz292151.Sub2">
+		<meta attribute="eclassName">Sub2</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz292151</meta>
+		<many-to-one name="a1" entity-name="Sub1" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="sub2_a1" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`sub1_a1_e_id`"/>
+		</many-to-one>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292151Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292151Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fdcc69bd2
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292151Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,36 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz292151.impl.BaseImpl" entity-name="Base" abstract="false" lazy="true" table="`base`" proxy="org.eclipse.emf.teneo.samples.issues.bz292151.Base">
+		<meta attribute="eclassName">Base</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz292151</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>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.bz292151.impl.Sub1Impl" entity-name="Sub1" abstract="false" lazy="true" extends="Base" table="`sub1`" proxy="org.eclipse.emf.teneo.samples.issues.bz292151.Sub1">
+		<meta attribute="eclassName">Sub1</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz292151</meta>
+		<key>
+			<column name="`base_e_id`"/>
+		</key>
+		<property name="a1" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`a1`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.bz292151.impl.Sub2Impl" entity-name="Sub2" abstract="false" lazy="true" extends="Base" table="`sub2`" proxy="org.eclipse.emf.teneo.samples.issues.bz292151.Sub2">
+		<meta attribute="eclassName">Sub2</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz292151</meta>
+		<key>
+			<column name="`base_e_id`"/>
+		</key>
+		<many-to-one name="a1" entity-name="Sub1" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="sub2_a1" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`sub1_a1_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292151Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292151Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fdcc69bd2
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292151Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,36 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz292151.impl.BaseImpl" entity-name="Base" abstract="false" lazy="true" table="`base`" proxy="org.eclipse.emf.teneo.samples.issues.bz292151.Base">
+		<meta attribute="eclassName">Base</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz292151</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>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.bz292151.impl.Sub1Impl" entity-name="Sub1" abstract="false" lazy="true" extends="Base" table="`sub1`" proxy="org.eclipse.emf.teneo.samples.issues.bz292151.Sub1">
+		<meta attribute="eclassName">Sub1</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz292151</meta>
+		<key>
+			<column name="`base_e_id`"/>
+		</key>
+		<property name="a1" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`a1`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.bz292151.impl.Sub2Impl" entity-name="Sub2" abstract="false" lazy="true" extends="Base" table="`sub2`" proxy="org.eclipse.emf.teneo.samples.issues.bz292151.Sub2">
+		<meta attribute="eclassName">Sub2</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz292151</meta>
+		<key>
+			<column name="`base_e_id`"/>
+		</key>
+		<many-to-one name="a1" entity-name="Sub1" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="sub2_a1" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`sub1_a1_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz293848Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz293848Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c1b87d653
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz293848Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,95 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class entity-name="ComType" abstract="false" lazy="true" discriminator-value="ComType" table="`comtype`" proxy="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+		<meta attribute="eclassName">ComType</meta>
+		<meta attribute="epackage">http://www.tech.com/tech/test/UploadNewXSDTest</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 type="string">
+			<column name="dtype" index="comtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="employees" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="comtype_employees">
+				<column name="`comtype_employees_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`comtype_employees_idx`"/>
+			<one-to-many entity-name="PersonType"/>
+		</list>
+		<many-to-one name="location" entity-name="LocationType" lazy="proxy" cascade="all" foreign-key="comtype_location" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`locationtype_location_e_id`"/>
+		</many-to-one>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class entity-name="Department" abstract="false" lazy="true" discriminator-value="Department" table="`department`" proxy="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+		<meta attribute="eclassName">Department</meta>
+		<meta attribute="epackage">http://www.tech.com/tech/test/UploadNewXSDTest</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 type="string">
+			<column name="dtype" index="departmentdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="booktype" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`booktype`"/>
+		</property>
+		<property name="bookname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`bookname`"/>
+		</property>
+	</class>
+	<class entity-name="LocationType" abstract="false" lazy="true" discriminator-value="LocationType" table="`locationtype`" proxy="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+		<meta attribute="eclassName">LocationType</meta>
+		<meta attribute="epackage">http://www.tech.com/tech/test/UploadNewXSDTest</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 type="string">
+			<column name="dtype" index="locationtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="zip" entity-name="Department" lazy="proxy" cascade="all" foreign-key="locationtype_zip" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`department_zip_e_id`"/>
+		</many-to-one>
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+	</class>
+	<class entity-name="PersonType" abstract="false" lazy="true" discriminator-value="PersonType" table="`persontype`" proxy="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+		<meta attribute="eclassName">PersonType</meta>
+		<meta attribute="epackage">http://www.tech.com/tech/test/UploadNewXSDTest</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 type="string">
+			<column name="dtype" index="persontypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`lastname`"/>
+		</property>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+		<property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`firstname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz293848Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz293848Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9de0ddff7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz293848Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,83 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class entity-name="ComType" abstract="false" lazy="true" table="`comtype`" proxy="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+		<meta attribute="eclassName" inherit="false">ComType</meta>
+		<meta attribute="epackage" inherit="false">http://www.tech.com/tech/test/UploadNewXSDTest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="employees" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="comtype_employees">
+				<column name="`comtype_employees_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`comtype_employees_idx`"/>
+			<one-to-many entity-name="PersonType"/>
+		</list>
+		<many-to-one name="location" entity-name="LocationType" lazy="proxy" cascade="all" foreign-key="comtype_location" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`locationtype_location_e_id`"/>
+		</many-to-one>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class entity-name="Department" abstract="false" lazy="true" table="`department`" proxy="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+		<meta attribute="eclassName" inherit="false">Department</meta>
+		<meta attribute="epackage" inherit="false">http://www.tech.com/tech/test/UploadNewXSDTest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="booktype" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`booktype`"/>
+		</property>
+		<property name="bookname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`bookname`"/>
+		</property>
+	</class>
+	<class entity-name="LocationType" abstract="false" lazy="true" table="`locationtype`" proxy="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+		<meta attribute="eclassName" inherit="false">LocationType</meta>
+		<meta attribute="epackage" inherit="false">http://www.tech.com/tech/test/UploadNewXSDTest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="zip" entity-name="Department" lazy="proxy" cascade="all" foreign-key="locationtype_zip" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`department_zip_e_id`"/>
+		</many-to-one>
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+	</class>
+	<class entity-name="PersonType" abstract="false" lazy="true" table="`persontype`" proxy="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+		<meta attribute="eclassName" inherit="false">PersonType</meta>
+		<meta attribute="epackage" inherit="false">http://www.tech.com/tech/test/UploadNewXSDTest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`lastname`"/>
+		</property>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+		<property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`firstname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz293848Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz293848Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9de0ddff7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz293848Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,83 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class entity-name="ComType" abstract="false" lazy="true" table="`comtype`" proxy="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+		<meta attribute="eclassName" inherit="false">ComType</meta>
+		<meta attribute="epackage" inherit="false">http://www.tech.com/tech/test/UploadNewXSDTest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="employees" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="comtype_employees">
+				<column name="`comtype_employees_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`comtype_employees_idx`"/>
+			<one-to-many entity-name="PersonType"/>
+		</list>
+		<many-to-one name="location" entity-name="LocationType" lazy="proxy" cascade="all" foreign-key="comtype_location" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`locationtype_location_e_id`"/>
+		</many-to-one>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class entity-name="Department" abstract="false" lazy="true" table="`department`" proxy="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+		<meta attribute="eclassName" inherit="false">Department</meta>
+		<meta attribute="epackage" inherit="false">http://www.tech.com/tech/test/UploadNewXSDTest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="booktype" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`booktype`"/>
+		</property>
+		<property name="bookname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`bookname`"/>
+		</property>
+	</class>
+	<class entity-name="LocationType" abstract="false" lazy="true" table="`locationtype`" proxy="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+		<meta attribute="eclassName" inherit="false">LocationType</meta>
+		<meta attribute="epackage" inherit="false">http://www.tech.com/tech/test/UploadNewXSDTest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="zip" entity-name="Department" lazy="proxy" cascade="all" foreign-key="locationtype_zip" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`department_zip_e_id`"/>
+		</many-to-one>
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+	</class>
+	<class entity-name="PersonType" abstract="false" lazy="true" table="`persontype`" proxy="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+		<meta attribute="eclassName" inherit="false">PersonType</meta>
+		<meta attribute="epackage" inherit="false">http://www.tech.com/tech/test/UploadNewXSDTest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`lastname`"/>
+		</property>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+		<property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`firstname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz294201Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz294201Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b97d89a12
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz294201Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,80 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class entity-name="documentrootexp.DocumentRoot" abstract="false" lazy="false" discriminator-value="documentrootexp.DocumentRoot" table="`documentrootexp_documentroot`">
+		<meta attribute="eclassName">DocumentRoot</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentrootexp</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 type="string">
+			<column name="dtype" index="documentrootexp_documentrootdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="mixed" table="`documentrootexp_documentroot_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`documentroot_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`documentroot_mixed_idx`"/>
+			<one-to-many entity-name="DocumentRoot_mixed"/>
+		</list>
+	</class>
+	<class entity-name="DocumentRoot_mixed" lazy="false" table="`documentroot_mixed`">
+		<meta attribute="featureMap">documentrootexp.DocumentRoot</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<map name="xMLNSPrefixMap" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_documentroot_xmlnsprefixmap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<map name="xSISchemaLocation" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_documentroot_xsischemalocation_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<any id-type="long" meta-type="string" name="aNYTHING" cascade="all">
+			<column not-null="false" unique="false" name="`mixed_anything_type`"/>
+			<column not-null="false" unique="false" name="`mixed_anything_id`"/>
+		</any>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="PersonType" abstract="false" lazy="false" discriminator-value="PersonType" table="`persontype`">
+		<meta attribute="eclassName">PersonType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentrootexp</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 type="string">
+			<column name="dtype" index="persontypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`lastname`"/>
+		</property>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+		<property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`firstname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz294201Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz294201Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c906171a6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz294201Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,74 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class entity-name="documentrootexp.DocumentRoot" abstract="false" lazy="false" table="`documentrootexp_documentroot`">
+		<meta attribute="eclassName" inherit="false">DocumentRoot</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentrootexp</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`documentrootexp_documentroot_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`documentroot_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`documentroot_mixed_idx`"/>
+			<one-to-many entity-name="DocumentRoot_mixed"/>
+		</list>
+	</class>
+	<class entity-name="DocumentRoot_mixed" lazy="false" table="`documentroot_mixed`">
+		<meta attribute="featureMap" inherit="false">documentrootexp.DocumentRoot</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<map name="xMLNSPrefixMap" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_documentroot_xmlnsprefixmap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<map name="xSISchemaLocation" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_documentroot_xsischemalocation_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<any id-type="long" meta-type="string" name="aNYTHING" cascade="all">
+			<column not-null="false" unique="false" name="`mixed_anything_type`"/>
+			<column not-null="false" unique="false" name="`mixed_anything_id`"/>
+		</any>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="PersonType" abstract="false" lazy="false" table="`persontype`">
+		<meta attribute="eclassName" inherit="false">PersonType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentrootexp</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`lastname`"/>
+		</property>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+		<property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`firstname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz294201Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz294201Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c906171a6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz294201Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,74 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class entity-name="documentrootexp.DocumentRoot" abstract="false" lazy="false" table="`documentrootexp_documentroot`">
+		<meta attribute="eclassName" inherit="false">DocumentRoot</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentrootexp</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="mixed" table="`documentrootexp_documentroot_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`documentroot_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`documentroot_mixed_idx`"/>
+			<one-to-many entity-name="DocumentRoot_mixed"/>
+		</list>
+	</class>
+	<class entity-name="DocumentRoot_mixed" lazy="false" table="`documentroot_mixed`">
+		<meta attribute="featureMap" inherit="false">documentrootexp.DocumentRoot</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<map name="xMLNSPrefixMap" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_documentroot_xmlnsprefixmap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<map name="xSISchemaLocation" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_documentroot_xsischemalocation_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<any id-type="long" meta-type="string" name="aNYTHING" cascade="all">
+			<column not-null="false" unique="false" name="`mixed_anything_type`"/>
+			<column not-null="false" unique="false" name="`mixed_anything_id`"/>
+		</any>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="PersonType" abstract="false" lazy="false" table="`persontype`">
+		<meta attribute="eclassName" inherit="false">PersonType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentrootexp</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`lastname`"/>
+		</property>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+		<property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`firstname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321768Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321768Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..984e89833
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321768Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,26 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http:///www.elver.org/org.eclipse.emf.teneo.hibernate.test.issues.Bz321768Action</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<component name="name" class="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+			<meta attribute="eclassName" inherit="false">Name</meta>
+			<meta attribute="epackage">http:///www.elver.org/org.eclipse.emf.teneo.hibernate.test.issues.Bz321768Action</meta>
+			<property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`name_firstname`"/>
+			</property>
+			<property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`name_lastname`"/>
+			</property>
+		</component>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321768Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321768Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..984e89833
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321768Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,26 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http:///www.elver.org/org.eclipse.emf.teneo.hibernate.test.issues.Bz321768Action</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<component name="name" class="org.eclipse.emf.ecore.impl.DynamicEObjectImpl">
+			<meta attribute="eclassName" inherit="false">Name</meta>
+			<meta attribute="epackage">http:///www.elver.org/org.eclipse.emf.teneo.hibernate.test.issues.Bz321768Action</meta>
+			<property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`name_firstname`"/>
+			</property>
+			<property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`name_lastname`"/>
+			</property>
+		</component>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321770Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321770Action_hsqldb_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..88a48194a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321770Action_hsqldb_e_o_hibernate.hbm.xml
@@ -0,0 +1,36 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz321770.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" table="`child`">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz321770</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz321770.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" table="`parent`">
+		<meta attribute="eclassName" inherit="false">Parent</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz321770</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<bag name="child" order-by="`id` asc" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_child">
+				<column name="`parent_child_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Child"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321770Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321770Action_hsqldb_h_o_hibernate.hbm.xml
new file mode 100755
index 000000000..149886370
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321770Action_hsqldb_h_o_hibernate.hbm.xml
@@ -0,0 +1,42 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz321770.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" discriminator-value="Child" table="`child`">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz321770</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="childdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz321770.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" discriminator-value="Parent" table="`parent`">
+		<meta attribute="eclassName" inherit="false">Parent</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz321770</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="parentdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<bag name="child" order-by="`id` asc" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_child">
+				<column name="`parent_child_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Child"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321770Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321770Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..88a48194a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321770Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,36 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz321770.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" table="`child`">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz321770</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz321770.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" table="`parent`">
+		<meta attribute="eclassName" inherit="false">Parent</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz321770</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<bag name="child" order-by="`id` asc" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_child">
+				<column name="`parent_child_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Child"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321770Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321770Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..88a48194a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321770Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,36 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz321770.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" table="`child`">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz321770</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz321770.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" table="`parent`">
+		<meta attribute="eclassName" inherit="false">Parent</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz321770</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<bag name="child" order-by="`id` asc" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_child">
+				<column name="`parent_child_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Child"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321773Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321773Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b41b99ec6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321773Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz321773.impl.Item1Impl" entity-name="Item1" abstract="false" lazy="false" table="`item1`">
+		<meta attribute="eclassName" inherit="false">Item1</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz321773</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="sequence">
+				<param name="sequence">firstSeq</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="data" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`data`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz321773.impl.Item2Impl" entity-name="Item2" abstract="false" lazy="false" table="`item2`">
+		<meta attribute="eclassName" inherit="false">Item2</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz321773</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="seqhilo">
+				<param name="sequence">secondSeq</param>
+				<param name="max_lo">24</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="data" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`data`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321773Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321773Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b41b99ec6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz321773Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz321773.impl.Item1Impl" entity-name="Item1" abstract="false" lazy="false" table="`item1`">
+		<meta attribute="eclassName" inherit="false">Item1</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz321773</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="sequence">
+				<param name="sequence">firstSeq</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="data" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`data`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz321773.impl.Item2Impl" entity-name="Item2" abstract="false" lazy="false" table="`item2`">
+		<meta attribute="eclassName" inherit="false">Item2</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz321773</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="seqhilo">
+				<param name="sequence">secondSeq</param>
+				<param name="max_lo">24</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="data" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`data`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b9bef49b9
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,193 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.ProductImpl" entity-name="Product" abstract="false" lazy="false" discriminator-value="Product" table="`product`">
+		<meta attribute="eclassName">Product</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</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 type="string">
+			<column name="dtype" index="productdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="number" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Integer">
+			<column not-null="false" unique="false" name="`number`"/>
+		</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>
+		<many-to-one name="productCategory" entity-name="ProductCategory" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="product_productcategory" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`product_productcategory_e_id`"/>
+		</many-to-one>
+		<many-to-one name="priceCategory" entity-name="PriceCategory" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="product_pricecategory" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`pricecategory_pricecategory_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" discriminator-value="Customer" table="`customer`">
+		<meta attribute="eclassName">Customer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</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 type="string">
+			<column name="dtype" index="customerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="surname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`surname`"/>
+		</property>
+		<property name="familyName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`familyname`"/>
+		</property>
+		<property name="telephoneNr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`telephonenr`"/>
+		</property>
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+		<property name="hotel" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`hotel`"/>
+		</property>
+		<list name="comments" table="`customer_comments`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`customer_comments_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`customer_comments_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.ProductCategoryImpl" entity-name="ProductCategory" abstract="false" lazy="false" discriminator-value="ProductCategory" table="`productcategory`">
+		<meta attribute="eclassName">ProductCategory</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</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 type="string">
+			<column name="dtype" index="productcategorydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="products" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`product_productcategory_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`productcategory_products_idx`"/>
+			<one-to-many entity-name="Product"/>
+		</list>
+		<list name="subCategorys" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`productcategory_parent_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`productcategory_subcategorys_idx`"/>
+			<one-to-many entity-name="ProductCategory"/>
+		</list>
+		<many-to-one name="parent" entity-name="ProductCategory" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="productcategory_parent" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`productcategory_parent_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.PriceCategoryImpl" entity-name="PriceCategory" abstract="false" lazy="false" discriminator-value="PriceCategory" table="`pricecategory`">
+		<meta attribute="eclassName">PriceCategory</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="pricecategorydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="prices" table="`pricecategory_prices`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pricecategory_prices_name`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`pricecategory_prices_idx`"/>
+			<element type="double"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.OrderImpl" entity-name="Order" abstract="false" lazy="false" discriminator-value="Order" table="`order`">
+		<meta attribute="eclassName">Order</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</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 type="string">
+			<column name="dtype" index="orderdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="number" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`number`"/>
+		</property>
+		<list name="transactions" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`transaction_order_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`order_transactions_idx`"/>
+			<one-to-many entity-name="Transaction"/>
+		</list>
+		<many-to-one name="customer" entity-name="Customer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="order_customer" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`customer_customer_e_id`"/>
+		</many-to-one>
+		<list name="comments" table="`order_comments`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`order_comments_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`order_comments_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.TransactionImpl" entity-name="Transaction" abstract="false" lazy="false" discriminator-value="Transaction" table="`transaction`">
+		<meta attribute="eclassName">Transaction</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</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 type="string">
+			<column name="dtype" index="transactiondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="number" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`number`"/>
+		</property>
+		<many-to-one name="order" entity-name="Order" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="transaction_order" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`transaction_order_e_id`"/>
+		</many-to-one>
+		<many-to-one name="product" entity-name="Product" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="transaction_product" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`product_product_e_id`"/>
+		</many-to-one>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="paidDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`paiddate`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d5330bd69
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,175 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.ProductImpl" entity-name="Product" abstract="false" lazy="false" table="`product`">
+		<meta attribute="eclassName" inherit="false">Product</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="number" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Integer">
+			<column not-null="false" unique="false" name="`number`"/>
+		</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>
+		<many-to-one name="productCategory" entity-name="ProductCategory" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="product_productcategory" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`product_productcategory_e_id`"/>
+		</many-to-one>
+		<many-to-one name="priceCategory" entity-name="PriceCategory" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="product_pricecategory" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`pricecategory_pricecategory_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
+		<meta attribute="eclassName" inherit="false">Customer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="surname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`surname`"/>
+		</property>
+		<property name="familyName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`familyname`"/>
+		</property>
+		<property name="telephoneNr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`telephonenr`"/>
+		</property>
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+		<property name="hotel" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`hotel`"/>
+		</property>
+		<list name="comments" table="`customer_comments`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`customer_comments_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`customer_comments_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.ProductCategoryImpl" entity-name="ProductCategory" abstract="false" lazy="false" table="`productcategory`">
+		<meta attribute="eclassName" inherit="false">ProductCategory</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="products" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`product_productcategory_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`productcategory_products_idx`"/>
+			<one-to-many entity-name="Product"/>
+		</list>
+		<list name="subCategorys" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`productcategory_parent_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`productcategory_subcategorys_idx`"/>
+			<one-to-many entity-name="ProductCategory"/>
+		</list>
+		<many-to-one name="parent" entity-name="ProductCategory" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="productcategory_parent" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`productcategory_parent_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.PriceCategoryImpl" entity-name="PriceCategory" abstract="false" lazy="false" table="`pricecategory`">
+		<meta attribute="eclassName" inherit="false">PriceCategory</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="prices" table="`pricecategory_prices`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pricecategory_prices_name`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`pricecategory_prices_idx`"/>
+			<element type="double"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.OrderImpl" entity-name="Order" abstract="false" lazy="false" table="`order`">
+		<meta attribute="eclassName" inherit="false">Order</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="number" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`number`"/>
+		</property>
+		<list name="transactions" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`transaction_order_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`order_transactions_idx`"/>
+			<one-to-many entity-name="Transaction"/>
+		</list>
+		<many-to-one name="customer" entity-name="Customer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="order_customer" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`customer_customer_e_id`"/>
+		</many-to-one>
+		<list name="comments" table="`order_comments`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`order_comments_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`order_comments_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.TransactionImpl" entity-name="Transaction" abstract="false" lazy="false" table="`transaction`">
+		<meta attribute="eclassName" inherit="false">Transaction</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="number" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`number`"/>
+		</property>
+		<many-to-one name="order" entity-name="Order" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="transaction_order" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`transaction_order_e_id`"/>
+		</many-to-one>
+		<many-to-one name="product" entity-name="Product" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="transaction_product" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`product_product_e_id`"/>
+		</many-to-one>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="paidDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`paiddate`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d5330bd69
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,175 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.ProductImpl" entity-name="Product" abstract="false" lazy="false" table="`product`">
+		<meta attribute="eclassName" inherit="false">Product</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="number" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Integer">
+			<column not-null="false" unique="false" name="`number`"/>
+		</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>
+		<many-to-one name="productCategory" entity-name="ProductCategory" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="product_productcategory" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`product_productcategory_e_id`"/>
+		</many-to-one>
+		<many-to-one name="priceCategory" entity-name="PriceCategory" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="product_pricecategory" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`pricecategory_pricecategory_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
+		<meta attribute="eclassName" inherit="false">Customer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="surname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`surname`"/>
+		</property>
+		<property name="familyName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`familyname`"/>
+		</property>
+		<property name="telephoneNr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`telephonenr`"/>
+		</property>
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+		<property name="hotel" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`hotel`"/>
+		</property>
+		<list name="comments" table="`customer_comments`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`customer_comments_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`customer_comments_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.ProductCategoryImpl" entity-name="ProductCategory" abstract="false" lazy="false" table="`productcategory`">
+		<meta attribute="eclassName" inherit="false">ProductCategory</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="products" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`product_productcategory_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`productcategory_products_idx`"/>
+			<one-to-many entity-name="Product"/>
+		</list>
+		<list name="subCategorys" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`productcategory_parent_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`productcategory_subcategorys_idx`"/>
+			<one-to-many entity-name="ProductCategory"/>
+		</list>
+		<many-to-one name="parent" entity-name="ProductCategory" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="productcategory_parent" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`productcategory_parent_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.PriceCategoryImpl" entity-name="PriceCategory" abstract="false" lazy="false" table="`pricecategory`">
+		<meta attribute="eclassName" inherit="false">PriceCategory</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="prices" table="`pricecategory_prices`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`pricecategory_prices_name`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`pricecategory_prices_idx`"/>
+			<element type="double"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.OrderImpl" entity-name="Order" abstract="false" lazy="false" table="`order`">
+		<meta attribute="eclassName" inherit="false">Order</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="number" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`number`"/>
+		</property>
+		<list name="transactions" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`transaction_order_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`order_transactions_idx`"/>
+			<one-to-many entity-name="Transaction"/>
+		</list>
+		<many-to-one name="customer" entity-name="Customer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="order_customer" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`customer_customer_e_id`"/>
+		</many-to-one>
+		<list name="comments" table="`order_comments`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`order_comments_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`order_comments_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.TransactionImpl" entity-name="Transaction" abstract="false" lazy="false" table="`transaction`">
+		<meta attribute="eclassName" inherit="false">Transaction</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/nocollectionowner</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="number" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`number`"/>
+		</property>
+		<many-to-one name="order" entity-name="Order" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="transaction_order" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`transaction_order_e_id`"/>
+		</many-to-one>
+		<many-to-one name="product" entity-name="Product" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="transaction_product" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`product_product_e_id`"/>
+		</many-to-one>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="paidDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`paiddate`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/TransientOtmAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/TransientOtmAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..853af3ffa
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/TransientOtmAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,42 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.hibernate.transientotm.impl.TBookImpl" entity-name="TBook" abstract="false" lazy="false" discriminator-value="TBook" table="`tbook`">
+		<meta attribute="eclassName">TBook</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/hibernate/transientotm</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 type="string">
+			<column name="dtype" index="tbookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.hibernate.transientotm.impl.TWriterImpl" entity-name="TWriter" abstract="false" lazy="false" discriminator-value="TWriter" table="`twriter`">
+		<meta attribute="eclassName">TWriter</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/hibernate/transientotm</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 type="string">
+			<column name="dtype" index="twriterdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="book" entity-name="TBook" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="twriter_book" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`tbook_book_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/TransientOtmAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/TransientOtmAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..eacecdfcc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/TransientOtmAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,36 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.hibernate.transientotm.impl.TBookImpl" entity-name="TBook" abstract="false" lazy="false" table="`tbook`">
+		<meta attribute="eclassName" inherit="false">TBook</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/hibernate/transientotm</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.hibernate.transientotm.impl.TWriterImpl" entity-name="TWriter" abstract="false" lazy="false" table="`twriter`">
+		<meta attribute="eclassName" inherit="false">TWriter</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/hibernate/transientotm</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="book" entity-name="TBook" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="twriter_book" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`tbook_book_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/TransientOtmAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/TransientOtmAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..eacecdfcc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/TransientOtmAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,36 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.hibernate.transientotm.impl.TBookImpl" entity-name="TBook" abstract="false" lazy="false" table="`tbook`">
+		<meta attribute="eclassName" inherit="false">TBook</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/hibernate/transientotm</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.hibernate.transientotm.impl.TWriterImpl" entity-name="TWriter" abstract="false" lazy="false" table="`twriter`">
+		<meta attribute="eclassName" inherit="false">TWriter</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/hibernate/transientotm</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="book" entity-name="TBook" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="twriter_book" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`tbook_book_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/UpdateAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/UpdateAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..89a3b3db4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/UpdateAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.update.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" discriminator-value="Child" table="`child`">
+		<meta attribute="eclassName">Child</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/update</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="childdtype" length="255" not-null="true"/>
+		</discriminator>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.update.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" discriminator-value="Parent" table="`parent`">
+		<meta attribute="eclassName">Parent</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/update</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="parentdtype" length="255" not-null="true"/>
+		</discriminator>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<list name="children" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_children">
+				<column name="`parent_children_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_children_idx`"/>
+			<one-to-many entity-name="Child"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/UpdateAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/UpdateAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..13c5720ac
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/UpdateAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,32 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.update.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" table="`child`">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/update</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.update.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" table="`parent`">
+		<meta attribute="eclassName" inherit="false">Parent</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/update</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<list name="children" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_children">
+				<column name="`parent_children_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_children_idx`"/>
+			<one-to-many entity-name="Child"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/UpdateAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/UpdateAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..13c5720ac
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/UpdateAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,32 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.update.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" table="`child`">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/update</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.update.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" table="`parent`">
+		<meta attribute="eclassName" inherit="false">Parent</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/update</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<list name="children" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_children">
+				<column name="`parent_children_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_children_idx`"/>
+			<one-to-many entity-name="Child"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c0fef8824
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,69 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
+		<id type="long" name="myid" column="myid" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="postalCode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postalcode`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" discriminator-value="Employee" table="`employee`">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="employeedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`employee_address_id`"/>
+		</many-to-one>
+		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`department`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.StudentImpl" entity-name="Student" abstract="false" lazy="false" discriminator-value="Student" table="`student`">
+		<meta attribute="eclassName">Student</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="studentdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<property name="faculty" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`faculty`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..aaf933472
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,60 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
+		<id type="long" name="myid" column="myid" 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="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="postalCode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postalcode`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" table="`employee`">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`employee_address_id`"/>
+		</many-to-one>
+		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`department`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.StudentImpl" entity-name="Student" abstract="false" lazy="false" table="`student`">
+		<meta attribute="eclassName">Student</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<property name="faculty" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`faculty`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..aaf933472
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,60 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
+		<id type="long" name="myid" column="myid" 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="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="postalCode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postalcode`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" table="`employee`">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`employee_address_id`"/>
+		</many-to-one>
+		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`department`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.StudentImpl" entity-name="Student" abstract="false" lazy="false" table="`student`">
+		<meta attribute="eclassName">Student</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<property name="faculty" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`faculty`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_xjoin_hibernate.hbm.xml
new file mode 100755
index 000000000..aaf933472
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_xjoin_hibernate.hbm.xml
@@ -0,0 +1,60 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
+		<id type="long" name="myid" column="myid" 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="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="postalCode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postalcode`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" table="`employee`">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`employee_address_id`"/>
+		</many-to-one>
+		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`department`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.StudentImpl" entity-name="Student" abstract="false" lazy="false" table="`student`">
+		<meta attribute="eclassName">Student</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<property name="faculty" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`faculty`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_xsingle_hibernate.hbm.xml
new file mode 100755
index 000000000..c0fef8824
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_xsingle_hibernate.hbm.xml
@@ -0,0 +1,69 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
+		<id type="long" name="myid" column="myid" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="postalCode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postalcode`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" discriminator-value="Employee" table="`employee`">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="employeedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`employee_address_id`"/>
+		</many-to-one>
+		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`department`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.StudentImpl" entity-name="Student" abstract="false" lazy="false" discriminator-value="Student" table="`student`">
+		<meta attribute="eclassName">Student</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="studentdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<property name="faculty" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`faculty`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1741f2cc0
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http:///org/eclipse/emf/teneo/samples/emf/annotations/attributeoverrides.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 type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<component name="bornIn" class="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.CityImpl">
+			<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`bornnamecolumn`"/>
+			</property>
+			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`bornin_country`"/>
+			</property>
+		</component>
+		<component name="livesIn" class="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.CityImpl">
+			<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`namecolumn`"/>
+			</property>
+			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`countrycolumn`"/>
+			</property>
+		</component>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..69184ed37
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,35 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http:///org/eclipse/emf/teneo/samples/emf/annotations/attributeoverrides.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">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<component name="bornIn" class="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.CityImpl">
+			<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`bornnamecolumn`"/>
+			</property>
+			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`bornin_country`"/>
+			</property>
+		</component>
+		<component name="livesIn" class="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.CityImpl">
+			<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`namecolumn`"/>
+			</property>
+			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`countrycolumn`"/>
+			</property>
+		</component>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..69184ed37
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,35 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http:///org/eclipse/emf/teneo/samples/emf/annotations/attributeoverrides.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">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<component name="bornIn" class="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.CityImpl">
+			<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`bornnamecolumn`"/>
+			</property>
+			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`bornin_country`"/>
+			</property>
+		</component>
+		<component name="livesIn" class="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.CityImpl">
+			<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`namecolumn`"/>
+			</property>
+			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`countrycolumn`"/>
+			</property>
+		</component>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..37dc6c7dd
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,22 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.basic.impl.BasicImpl" entity-name="Basic" abstract="false" lazy="false" discriminator-value="Basic" table="`basic`">
+		<meta attribute="eclassName">Basic</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/basic</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 type="string">
+			<column name="dtype" index="basicdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="myVersion" type="long">
+			<column not-null="true" unique="false" name="`myversion`"/>
+		</version>
+		<property name="myOptionalBasic" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myoptionalbasic`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e700fa97b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,19 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.basic.impl.BasicImpl" entity-name="Basic" abstract="false" lazy="false" table="`basic`">
+		<meta attribute="eclassName">Basic</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/basic</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="myVersion" type="long">
+			<column not-null="true" unique="false" name="`myversion`"/>
+		</version>
+		<property name="myOptionalBasic" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myoptionalbasic`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e700fa97b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,19 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.basic.impl.BasicImpl" entity-name="Basic" abstract="false" lazy="false" table="`basic`">
+		<meta attribute="eclassName">Basic</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/basic</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="myVersion" type="long">
+			<column not-null="true" unique="false" name="`myversion`"/>
+		</version>
+		<property name="myOptionalBasic" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myoptionalbasic`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4a28bcc5d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,31 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/column</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 type="string">
+			<column name="dtype" index="mybooktabledtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`titel`" length="25"/>
+		</property>
+		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
+		</property>
+		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`author`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2871c98ac
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,28 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`mybooktable`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/column</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="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`titel`" length="25"/>
+		</property>
+		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
+		</property>
+		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`author`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2871c98ac
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,28 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`mybooktable`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/column</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="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`titel`" length="25"/>
+		</property>
+		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
+		</property>
+		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`author`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b33374da1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,95 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="cascadenotall.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..dd626ea46
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,86 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="cascadenotall.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..dd626ea46
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,86 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="cascadenotall.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_xjoin_hibernate.hbm.xml
new file mode 100755
index 000000000..dd626ea46
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_xjoin_hibernate.hbm.xml
@@ -0,0 +1,86 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="cascadenotall.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_xsingle_hibernate.hbm.xml
new file mode 100755
index 000000000..b33374da1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_xsingle_hibernate.hbm.xml
@@ -0,0 +1,95 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="cascadenotall.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f75b850a1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,39 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
+		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-id>
+		<discriminator type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" extends="Person" discriminator-value="Parent">
+		<meta attribute="eclassName">Parent</meta>
+		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
+		<list name="children" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="parent_children">
+				<column name="`myparentfirstname`" not-null="false" unique="false"/>
+				<column name="`myparentlastname`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_children_idx`"/>
+			<one-to-many entity-name="Child"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Person" discriminator-value="Child">
+		<meta attribute="eclassName">Child</meta>
+		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f69ba6902
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,44 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
+		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-id>
+		<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 name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" extends="Person" table="`parent`">
+		<meta attribute="eclassName">Parent</meta>
+		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
+		<key>
+			<column name="`person_firstname`"/>
+			<column name="`person_lastname`"/>
+		</key>
+		<list name="children" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="parent_children">
+				<column name="`myparentfirstname`" not-null="false" unique="false"/>
+				<column name="`myparentlastname`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_children_idx`"/>
+			<one-to-many entity-name="Child"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Person" table="`child`">
+		<meta attribute="eclassName">Child</meta>
+		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
+		<key>
+			<column name="`person_firstname`"/>
+			<column name="`person_lastname`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f69ba6902
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,44 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
+		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-id>
+		<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 name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" extends="Person" table="`parent`">
+		<meta attribute="eclassName">Parent</meta>
+		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
+		<key>
+			<column name="`person_firstname`"/>
+			<column name="`person_lastname`"/>
+		</key>
+		<list name="children" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="parent_children">
+				<column name="`myparentfirstname`" not-null="false" unique="false"/>
+				<column name="`myparentlastname`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_children_idx`"/>
+			<one-to-many entity-name="Child"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Person" table="`child`">
+		<meta attribute="eclassName">Child</meta>
+		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
+		<key>
+			<column name="`person_firstname`"/>
+			<column name="`person_lastname`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a608070bc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,360 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="com.ibm.example.connection.impl.M2mbjoinImpl" entity-name="M2mbjoin" abstract="false" lazy="false" discriminator-value="M2mbjoin" table="`m2mbjoin`">
+		<meta attribute="eclassName">M2mbjoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="id" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<bag name="parent" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`m2mbjoinjointable`">
+			<key update="true">
+				<column name="`m2mbjoin_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Parent" unique="false" foreign-key="m2mbjoin_parent">
+				<column name="`parent_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="com.ibm.example.connection.impl.M2osjoinImpl" entity-name="M2osjoin" abstract="false" lazy="false" discriminator-value="M2osjoin" table="`m2osjoin`">
+		<meta attribute="eclassName">M2osjoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.M2osparentImpl" entity-name="M2osparent" abstract="false" lazy="false" discriminator-value="M2osparent" table="`m2osparent`">
+		<meta attribute="eclassName">M2osparent</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2mbchildImpl" entity-name="O2mbchild" abstract="false" lazy="false" discriminator-value="O2mbchild" table="`o2mbchild`">
+		<meta attribute="eclassName">O2mbchild</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mbchild_parent" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`parent`"/>
+		</many-to-one>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2mbjoinImpl" entity-name="O2mbjoin" abstract="false" lazy="false" discriminator-value="O2mbjoin" table="`o2mbjoin`">
+		<meta attribute="eclassName">O2mbjoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mbjoin_parent" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`parent_parent_id`"/>
+		</many-to-one>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2mschildImpl" entity-name="O2mschild" abstract="false" lazy="false" discriminator-value="O2mschild" table="`o2mschild`">
+		<meta attribute="eclassName">O2mschild</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mschild_parent" lazy="false" insert="true" update="true"/>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2mschildInvisImpl" entity-name="O2mschildInvis" abstract="false" lazy="false" discriminator-value="O2mschildInvis" table="`o2mschildinvis`">
+		<meta attribute="eclassName">O2mschildInvis</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2msjoinImpl" entity-name="O2msjoin" abstract="false" lazy="false" discriminator-value="O2msjoin" table="`o2msjoin`">
+		<meta attribute="eclassName">O2msjoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2obchildImpl" entity-name="O2obchild" abstract="false" lazy="false" discriminator-value="O2obchild" table="`o2obchild`">
+		<meta attribute="eclassName">O2obchild</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2obchild_parent" lazy="false" insert="true" update="true">
+			<column not-null="false" unique="false" name="`parent`"/>
+		</many-to-one>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2objoinImpl" entity-name="O2objoin" abstract="false" lazy="false" discriminator-value="O2objoin" table="`o2objoin`">
+		<meta attribute="eclassName">O2objoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2objoin_parent" lazy="false" insert="true" update="true"/>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2obparentImpl" entity-name="O2obparent" abstract="false" lazy="false" discriminator-value="O2obparent" table="`o2obparent`">
+		<meta attribute="eclassName">O2obparent</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2obparent_parent" lazy="false" insert="true" update="true"/>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2oschildImpl" entity-name="O2oschild" abstract="false" lazy="false" discriminator-value="O2oschild" table="`o2oschild`">
+		<meta attribute="eclassName">O2oschild</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="false" name="`idchild`"/>
+			<generator class="foreign">
+				<param name="property">idChild</param>
+			</generator>
+		</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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2oschildInvisImpl" entity-name="O2oschildInvis" abstract="false" lazy="false" discriminator-value="O2oschildInvis" table="`o2oschildinvis`">
+		<meta attribute="eclassName">O2oschildInvis</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2osjoinImpl" entity-name="O2osjoin" abstract="false" lazy="false" discriminator-value="O2osjoin" table="`o2osjoin`">
+		<meta attribute="eclassName">O2osjoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2osparentImpl" entity-name="O2osparent" abstract="false" lazy="false" discriminator-value="O2osparent" table="`o2osparent`">
+		<meta attribute="eclassName">O2osparent</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" discriminator-value="Parent" table="`parent`">
+		<meta attribute="eclassName">Parent</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="id" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`id`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="o2osparent" entity-name="O2osparent" cascade="all" foreign-key="parent_o2osparent" lazy="false" insert="true" update="true">
+			<column not-null="false" unique="false" name="`o2osp`"/>
+		</many-to-one>
+		<one-to-one name="o2oschild" entity-name="O2oschild" foreign-key="parent_o2oschild" cascade="all" lazy="false" constrained="true"/>
+		<many-to-one name="o2osjoin" entity-name="O2osjoin" cascade="all" foreign-key="parent_o2osjoin" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`o2osjoin_o2osjoin_idchild`"/>
+		</many-to-one>
+		<many-to-one name="o2oschildInvis" entity-name="O2oschildInvis" cascade="all" foreign-key="parent_o2oschildinvis" lazy="false" insert="true" update="true"/>
+		<component name="o2oschildEmbed" class="com.ibm.example.connection.impl.O2oschildEmbedImpl">
+			<property name="phone" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+				<column not-null="false" unique="true" name="`phone`" length="25"/>
+			</property>
+		</component>
+		<many-to-one name="o2obparent" entity-name="O2obparent" cascade="all" foreign-key="parent_o2obparent" lazy="false" insert="true" update="true">
+			<column not-null="false" unique="false" name="`o2obp`"/>
+		</many-to-one>
+		<many-to-one name="o2obchild" entity-name="O2obchild" cascade="all" foreign-key="parent_o2obchild" lazy="false" insert="true" update="true"/>
+		<many-to-one name="o2objoin" entity-name="O2objoin" cascade="all" foreign-key="parent_o2objoin" lazy="false" insert="true" update="true"/>
+		<list name="o2mschild" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_o2mschild">
+				<column name="`parent_o2mschild_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_o2mschild_idx`"/>
+			<one-to-many entity-name="O2mschild"/>
+		</list>
+		<list name="o2msjoin" table="`o2msjoinjointable`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`id`" not-null="false" unique="true"/>
+			</key>
+			<list-index column="`parent_o2msjoin_idx`"/>
+			<many-to-many entity-name="O2msjoin" unique="true" foreign-key="parent_o2msjoin">
+				<column name="`idchild`" not-null="false" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="o2mschildInvis" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_o2mschildinvis">
+				<column name="`parent_o2mschildinvis_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_o2mschildinvis_idx`"/>
+			<one-to-many entity-name="O2mschildInvis"/>
+		</list>
+		<component name="o2mschildEmbed1" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`city1`"/>
+			</property>
+			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`state1`"/>
+			</property>
+		</component>
+		<component name="o2mschildEmbed2" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`city2`"/>
+			</property>
+			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`state2`"/>
+			</property>
+		</component>
+		<component name="o2mschildEmbed3" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`city3`"/>
+			</property>
+			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`state3`"/>
+			</property>
+		</component>
+		<list name="o2mbchild" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_o2mbchild">
+				<column name="`parent_o2mbchild_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_o2mbchild_idx`"/>
+			<one-to-many entity-name="O2mbchild"/>
+		</list>
+		<list name="o2mbjoin" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_o2mbjoin">
+				<column name="`parent_o2mbjoin_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_o2mbjoin_idx`"/>
+			<one-to-many entity-name="O2mbjoin"/>
+		</list>
+		<many-to-one name="m2osparent" entity-name="M2osparent" cascade="all" foreign-key="parent_m2osparent" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`m2osp`"/>
+		</many-to-one>
+		<many-to-one name="m2osjoin" entity-name="M2osjoin" cascade="all" foreign-key="parent_m2osjoin" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`m2osjoin_m2osjoin_idchild`"/>
+		</many-to-one>
+		<bag name="m2mbjoin" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`m2mbjoinjointable`">
+			<key update="true">
+				<column name="`parent_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="M2mbjoin" unique="false" foreign-key="parent_m2mbjoin">
+				<column name="`m2mbjoin_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2b6f3f89d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,344 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="com.ibm.example.connection.impl.M2mbjoinImpl" entity-name="M2mbjoin" abstract="false" lazy="false" table="`m2mbjoin`">
+		<meta attribute="eclassName">M2mbjoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="id" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<bag name="parent" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`m2mbjoinjointable`">
+			<key update="true">
+				<column name="`m2mbjoin_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Parent" unique="false" foreign-key="m2mbjoin_parent">
+				<column name="`parent_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="com.ibm.example.connection.impl.M2osjoinImpl" entity-name="M2osjoin" abstract="false" lazy="false" table="`m2osjoin`">
+		<meta attribute="eclassName">M2osjoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.M2osparentImpl" entity-name="M2osparent" abstract="false" lazy="false" table="`m2osparent`">
+		<meta attribute="eclassName">M2osparent</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2mbchildImpl" entity-name="O2mbchild" abstract="false" lazy="false" table="`o2mbchild`">
+		<meta attribute="eclassName">O2mbchild</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mbchild_parent" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`parent`"/>
+		</many-to-one>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2mbjoinImpl" entity-name="O2mbjoin" abstract="false" lazy="false" table="`o2mbjoin`">
+		<meta attribute="eclassName">O2mbjoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mbjoin_parent" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`parent_parent_id`"/>
+		</many-to-one>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2mschildImpl" entity-name="O2mschild" abstract="false" lazy="false" table="`o2mschild`">
+		<meta attribute="eclassName">O2mschild</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mschild_parent" lazy="false" insert="true" update="true"/>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2mschildInvisImpl" entity-name="O2mschildInvis" abstract="false" lazy="false" table="`o2mschildinvis`">
+		<meta attribute="eclassName">O2mschildInvis</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2msjoinImpl" entity-name="O2msjoin" abstract="false" lazy="false" table="`o2msjoin`">
+		<meta attribute="eclassName">O2msjoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2obchildImpl" entity-name="O2obchild" abstract="false" lazy="false" table="`o2obchild`">
+		<meta attribute="eclassName">O2obchild</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2obchild_parent" lazy="false" insert="true" update="true">
+			<column not-null="false" unique="false" name="`parent`"/>
+		</many-to-one>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2objoinImpl" entity-name="O2objoin" abstract="false" lazy="false" table="`o2objoin`">
+		<meta attribute="eclassName">O2objoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2objoin_parent" lazy="false" insert="true" update="true"/>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2obparentImpl" entity-name="O2obparent" abstract="false" lazy="false" table="`o2obparent`">
+		<meta attribute="eclassName">O2obparent</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2obparent_parent" lazy="false" insert="true" update="true"/>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2oschildImpl" entity-name="O2oschild" abstract="false" lazy="false" table="`o2oschild`">
+		<meta attribute="eclassName">O2oschild</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="false" name="`idchild`"/>
+			<generator class="foreign">
+				<param name="property">idChild</param>
+			</generator>
+		</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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2oschildInvisImpl" entity-name="O2oschildInvis" abstract="false" lazy="false" table="`o2oschildinvis`">
+		<meta attribute="eclassName">O2oschildInvis</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2osjoinImpl" entity-name="O2osjoin" abstract="false" lazy="false" table="`o2osjoin`">
+		<meta attribute="eclassName">O2osjoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2osparentImpl" entity-name="O2osparent" abstract="false" lazy="false" table="`o2osparent`">
+		<meta attribute="eclassName">O2osparent</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" table="`parent`">
+		<meta attribute="eclassName">Parent</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="id" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`id`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="o2osparent" entity-name="O2osparent" cascade="all" foreign-key="parent_o2osparent" lazy="false" insert="true" update="true">
+			<column not-null="false" unique="false" name="`o2osp`"/>
+		</many-to-one>
+		<one-to-one name="o2oschild" entity-name="O2oschild" foreign-key="parent_o2oschild" cascade="all" lazy="false" constrained="true"/>
+		<many-to-one name="o2osjoin" entity-name="O2osjoin" cascade="all" foreign-key="parent_o2osjoin" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`o2osjoin_o2osjoin_idchild`"/>
+		</many-to-one>
+		<many-to-one name="o2oschildInvis" entity-name="O2oschildInvis" cascade="all" foreign-key="parent_o2oschildinvis" lazy="false" insert="true" update="true"/>
+		<component name="o2oschildEmbed" class="com.ibm.example.connection.impl.O2oschildEmbedImpl">
+			<property name="phone" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+				<column not-null="false" unique="true" name="`phone`" length="25"/>
+			</property>
+		</component>
+		<many-to-one name="o2obparent" entity-name="O2obparent" cascade="all" foreign-key="parent_o2obparent" lazy="false" insert="true" update="true">
+			<column not-null="false" unique="false" name="`o2obp`"/>
+		</many-to-one>
+		<many-to-one name="o2obchild" entity-name="O2obchild" cascade="all" foreign-key="parent_o2obchild" lazy="false" insert="true" update="true"/>
+		<many-to-one name="o2objoin" entity-name="O2objoin" cascade="all" foreign-key="parent_o2objoin" lazy="false" insert="true" update="true"/>
+		<list name="o2mschild" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_o2mschild">
+				<column name="`parent_o2mschild_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_o2mschild_idx`"/>
+			<one-to-many entity-name="O2mschild"/>
+		</list>
+		<list name="o2msjoin" table="`o2msjoinjointable`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`id`" not-null="false" unique="true"/>
+			</key>
+			<list-index column="`parent_o2msjoin_idx`"/>
+			<many-to-many entity-name="O2msjoin" unique="true" foreign-key="parent_o2msjoin">
+				<column name="`idchild`" not-null="false" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="o2mschildInvis" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_o2mschildinvis">
+				<column name="`parent_o2mschildinvis_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_o2mschildinvis_idx`"/>
+			<one-to-many entity-name="O2mschildInvis"/>
+		</list>
+		<component name="o2mschildEmbed1" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`city1`"/>
+			</property>
+			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`state1`"/>
+			</property>
+		</component>
+		<component name="o2mschildEmbed2" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`city2`"/>
+			</property>
+			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`state2`"/>
+			</property>
+		</component>
+		<component name="o2mschildEmbed3" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`city3`"/>
+			</property>
+			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`state3`"/>
+			</property>
+		</component>
+		<list name="o2mbchild" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_o2mbchild">
+				<column name="`parent_o2mbchild_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_o2mbchild_idx`"/>
+			<one-to-many entity-name="O2mbchild"/>
+		</list>
+		<list name="o2mbjoin" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_o2mbjoin">
+				<column name="`parent_o2mbjoin_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_o2mbjoin_idx`"/>
+			<one-to-many entity-name="O2mbjoin"/>
+		</list>
+		<many-to-one name="m2osparent" entity-name="M2osparent" cascade="all" foreign-key="parent_m2osparent" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`m2osp`"/>
+		</many-to-one>
+		<many-to-one name="m2osjoin" entity-name="M2osjoin" cascade="all" foreign-key="parent_m2osjoin" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`m2osjoin_m2osjoin_idchild`"/>
+		</many-to-one>
+		<bag name="m2mbjoin" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`m2mbjoinjointable`">
+			<key update="true">
+				<column name="`parent_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="M2mbjoin" unique="false" foreign-key="parent_m2mbjoin">
+				<column name="`m2mbjoin_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2b6f3f89d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,344 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="com.ibm.example.connection.impl.M2mbjoinImpl" entity-name="M2mbjoin" abstract="false" lazy="false" table="`m2mbjoin`">
+		<meta attribute="eclassName">M2mbjoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="id" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<bag name="parent" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`m2mbjoinjointable`">
+			<key update="true">
+				<column name="`m2mbjoin_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Parent" unique="false" foreign-key="m2mbjoin_parent">
+				<column name="`parent_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="com.ibm.example.connection.impl.M2osjoinImpl" entity-name="M2osjoin" abstract="false" lazy="false" table="`m2osjoin`">
+		<meta attribute="eclassName">M2osjoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.M2osparentImpl" entity-name="M2osparent" abstract="false" lazy="false" table="`m2osparent`">
+		<meta attribute="eclassName">M2osparent</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2mbchildImpl" entity-name="O2mbchild" abstract="false" lazy="false" table="`o2mbchild`">
+		<meta attribute="eclassName">O2mbchild</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mbchild_parent" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`parent`"/>
+		</many-to-one>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2mbjoinImpl" entity-name="O2mbjoin" abstract="false" lazy="false" table="`o2mbjoin`">
+		<meta attribute="eclassName">O2mbjoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mbjoin_parent" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`parent_parent_id`"/>
+		</many-to-one>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2mschildImpl" entity-name="O2mschild" abstract="false" lazy="false" table="`o2mschild`">
+		<meta attribute="eclassName">O2mschild</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mschild_parent" lazy="false" insert="true" update="true"/>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2mschildInvisImpl" entity-name="O2mschildInvis" abstract="false" lazy="false" table="`o2mschildinvis`">
+		<meta attribute="eclassName">O2mschildInvis</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2msjoinImpl" entity-name="O2msjoin" abstract="false" lazy="false" table="`o2msjoin`">
+		<meta attribute="eclassName">O2msjoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2obchildImpl" entity-name="O2obchild" abstract="false" lazy="false" table="`o2obchild`">
+		<meta attribute="eclassName">O2obchild</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2obchild_parent" lazy="false" insert="true" update="true">
+			<column not-null="false" unique="false" name="`parent`"/>
+		</many-to-one>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2objoinImpl" entity-name="O2objoin" abstract="false" lazy="false" table="`o2objoin`">
+		<meta attribute="eclassName">O2objoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2objoin_parent" lazy="false" insert="true" update="true"/>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2obparentImpl" entity-name="O2obparent" abstract="false" lazy="false" table="`o2obparent`">
+		<meta attribute="eclassName">O2obparent</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2obparent_parent" lazy="false" insert="true" update="true"/>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2oschildImpl" entity-name="O2oschild" abstract="false" lazy="false" table="`o2oschild`">
+		<meta attribute="eclassName">O2oschild</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="false" name="`idchild`"/>
+			<generator class="foreign">
+				<param name="property">idChild</param>
+			</generator>
+		</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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2oschildInvisImpl" entity-name="O2oschildInvis" abstract="false" lazy="false" table="`o2oschildinvis`">
+		<meta attribute="eclassName">O2oschildInvis</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2osjoinImpl" entity-name="O2osjoin" abstract="false" lazy="false" table="`o2osjoin`">
+		<meta attribute="eclassName">O2osjoin</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.O2osparentImpl" entity-name="O2osparent" abstract="false" lazy="false" table="`o2osparent`">
+		<meta attribute="eclassName">O2osparent</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="idChild" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`idchild`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+	</class>
+	<class name="com.ibm.example.connection.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" table="`parent`">
+		<meta attribute="eclassName">Parent</meta>
+		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
+		<id name="id" type="int" unsaved-value="0">
+			<column not-null="false" unique="true" name="`id`"/>
+			<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="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`data`" length="25"/>
+		</property>
+		<many-to-one name="o2osparent" entity-name="O2osparent" cascade="all" foreign-key="parent_o2osparent" lazy="false" insert="true" update="true">
+			<column not-null="false" unique="false" name="`o2osp`"/>
+		</many-to-one>
+		<one-to-one name="o2oschild" entity-name="O2oschild" foreign-key="parent_o2oschild" cascade="all" lazy="false" constrained="true"/>
+		<many-to-one name="o2osjoin" entity-name="O2osjoin" cascade="all" foreign-key="parent_o2osjoin" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`o2osjoin_o2osjoin_idchild`"/>
+		</many-to-one>
+		<many-to-one name="o2oschildInvis" entity-name="O2oschildInvis" cascade="all" foreign-key="parent_o2oschildinvis" lazy="false" insert="true" update="true"/>
+		<component name="o2oschildEmbed" class="com.ibm.example.connection.impl.O2oschildEmbedImpl">
+			<property name="phone" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+				<column not-null="false" unique="true" name="`phone`" length="25"/>
+			</property>
+		</component>
+		<many-to-one name="o2obparent" entity-name="O2obparent" cascade="all" foreign-key="parent_o2obparent" lazy="false" insert="true" update="true">
+			<column not-null="false" unique="false" name="`o2obp`"/>
+		</many-to-one>
+		<many-to-one name="o2obchild" entity-name="O2obchild" cascade="all" foreign-key="parent_o2obchild" lazy="false" insert="true" update="true"/>
+		<many-to-one name="o2objoin" entity-name="O2objoin" cascade="all" foreign-key="parent_o2objoin" lazy="false" insert="true" update="true"/>
+		<list name="o2mschild" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_o2mschild">
+				<column name="`parent_o2mschild_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_o2mschild_idx`"/>
+			<one-to-many entity-name="O2mschild"/>
+		</list>
+		<list name="o2msjoin" table="`o2msjoinjointable`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`id`" not-null="false" unique="true"/>
+			</key>
+			<list-index column="`parent_o2msjoin_idx`"/>
+			<many-to-many entity-name="O2msjoin" unique="true" foreign-key="parent_o2msjoin">
+				<column name="`idchild`" not-null="false" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="o2mschildInvis" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_o2mschildinvis">
+				<column name="`parent_o2mschildinvis_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_o2mschildinvis_idx`"/>
+			<one-to-many entity-name="O2mschildInvis"/>
+		</list>
+		<component name="o2mschildEmbed1" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`city1`"/>
+			</property>
+			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`state1`"/>
+			</property>
+		</component>
+		<component name="o2mschildEmbed2" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`city2`"/>
+			</property>
+			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`state2`"/>
+			</property>
+		</component>
+		<component name="o2mschildEmbed3" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`city3`"/>
+			</property>
+			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`state3`"/>
+			</property>
+		</component>
+		<list name="o2mbchild" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_o2mbchild">
+				<column name="`parent_o2mbchild_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_o2mbchild_idx`"/>
+			<one-to-many entity-name="O2mbchild"/>
+		</list>
+		<list name="o2mbjoin" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="parent_o2mbjoin">
+				<column name="`parent_o2mbjoin_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_o2mbjoin_idx`"/>
+			<one-to-many entity-name="O2mbjoin"/>
+		</list>
+		<many-to-one name="m2osparent" entity-name="M2osparent" cascade="all" foreign-key="parent_m2osparent" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`m2osp`"/>
+		</many-to-one>
+		<many-to-one name="m2osjoin" entity-name="M2osjoin" cascade="all" foreign-key="parent_m2osjoin" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`m2osjoin_m2osjoin_idchild`"/>
+		</many-to-one>
+		<bag name="m2mbjoin" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`m2mbjoinjointable`">
+			<key update="true">
+				<column name="`parent_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="M2mbjoin" unique="false" foreign-key="parent_m2mbjoin">
+				<column name="`m2mbjoin_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d0e9c4fc7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,46 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ChildItemImpl" entity-name="ChildItem" abstract="false" lazy="false" discriminator-value="ChildItem" table="`childitem`">
+		<meta attribute="eclassName">ChildItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/duplicates</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 type="string">
+			<column name="dtype" index="childitemdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/duplicates</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 type="string">
+			<column name="dtype" index="itemdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="childItem" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="item_childitem">
+				<column name="`item_childitem_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`item_childitem_idx`"/>
+			<one-to-many entity-name="ChildItem"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1a7c4681f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,40 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ChildItemImpl" entity-name="ChildItem" abstract="false" lazy="false" table="`childitem`">
+		<meta attribute="eclassName">ChildItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/duplicates</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/duplicates</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="childItem" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="item_childitem">
+				<column name="`item_childitem_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`item_childitem_idx`"/>
+			<one-to-many entity-name="ChildItem"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1a7c4681f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,40 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ChildItemImpl" entity-name="ChildItem" abstract="false" lazy="false" table="`childitem`">
+		<meta attribute="eclassName">ChildItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/duplicates</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/duplicates</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="childItem" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="item_childitem">
+				<column name="`item_childitem_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`item_childitem_idx`"/>
+			<one-to-many entity-name="ChildItem"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..251a51ac3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,31 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/edatatype_column</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 type="string">
+			<column name="dtype" index="mybooktabledtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`titel`" length="25"/>
+		</property>
+		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
+		</property>
+		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`author`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..421d8f68b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,28 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`mybooktable`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/edatatype_column</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="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`titel`" length="25"/>
+		</property>
+		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
+		</property>
+		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`author`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..421d8f68b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,28 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`mybooktable`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/edatatype_column</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="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`titel`" length="25"/>
+		</property>
+		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
+		</property>
+		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`author`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_xjoin_hibernate.hbm.xml
new file mode 100755
index 000000000..421d8f68b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_xjoin_hibernate.hbm.xml
@@ -0,0 +1,28 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`mybooktable`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/edatatype_column</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="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`titel`" length="25"/>
+		</property>
+		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
+		</property>
+		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`author`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_xsingle_hibernate.hbm.xml
new file mode 100755
index 000000000..251a51ac3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_xsingle_hibernate.hbm.xml
@@ -0,0 +1,31 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/edatatype_column</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 type="string">
+			<column name="dtype" index="mybooktabledtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`titel`" length="25"/>
+		</property>
+		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
+		</property>
+		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`author`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9ba8dd165
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,89 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbedderImpl" entity-name="Embedder" abstract="false" lazy="false" discriminator-value="Embedder" table="`embedder`">
+		<meta attribute="eclassName">Embedder</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embedded</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 type="string">
+			<column name="dtype" index="embedderdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<component name="firstEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`columnstring3`"/>
+			</property>
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+				<column not-null="false" unique="false" name="`firstembedded_myinteger`"/>
+			</property>
+		</component>
+		<component name="secondEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`columnstring1`"/>
+			</property>
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+				<column not-null="false" unique="false" name="`columninteger1`"/>
+			</property>
+		</component>
+		<component name="thirdEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`columnstring2`"/>
+			</property>
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+				<column not-null="false" unique="false" name="`columninteger2`"/>
+			</property>
+		</component>
+		<list name="fourthEmbedded" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`embedder_fourthembedded_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`embedder_fourthembedded_idx`"/>
+			<composite-element class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
+				<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+					<column not-null="true" unique="false" name="`mystring`"/>
+				</property>
+				<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+					<column not-null="false" unique="false" name="`myinteger`"/>
+				</property>
+			</composite-element>
+		</list>
+		<component name="fifthEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`fifthembedded_mystring`"/>
+			</property>
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+				<column not-null="false" unique="false" name="`fifthembedded_myinteger`"/>
+			</property>
+		</component>
+		<component name="alsoEmbeddable" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AlsoEmbeddableImpl">
+			<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`alsoembeddable_name`"/>
+			</property>
+		</component>
+		<component name="anotherEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AnotherEmbeddableImpl">
+			<property name="anotherName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`anotherembedded_anothername`"/>
+			</property>
+			<list name="aOneToMany" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+				<key update="true">
+					<column name="`anotherembeddable_aonetomany_e_id`" not-null="true" unique="false"/>
+				</key>
+				<list-index column="`anotherembeddable_aonetomany_idx`"/>
+				<composite-element class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AOneToManyImpl">
+					<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+						<column not-null="true" unique="false" name="`anotherembedded_name`"/>
+					</property>
+				</composite-element>
+			</list>
+			<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`anotherembedded_name`"/>
+			</property>
+		</component>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b064080ad
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,86 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbedderImpl" entity-name="Embedder" abstract="false" lazy="false" table="`embedder`">
+		<meta attribute="eclassName">Embedder</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embedded</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>
+		<component name="firstEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`columnstring3`"/>
+			</property>
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+				<column not-null="false" unique="false" name="`firstembedded_myinteger`"/>
+			</property>
+		</component>
+		<component name="secondEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`columnstring1`"/>
+			</property>
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+				<column not-null="false" unique="false" name="`columninteger1`"/>
+			</property>
+		</component>
+		<component name="thirdEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`columnstring2`"/>
+			</property>
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+				<column not-null="false" unique="false" name="`columninteger2`"/>
+			</property>
+		</component>
+		<list name="fourthEmbedded" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`embedder_fourthembedded_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`embedder_fourthembedded_idx`"/>
+			<composite-element class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
+				<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+					<column not-null="true" unique="false" name="`mystring`"/>
+				</property>
+				<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+					<column not-null="false" unique="false" name="`myinteger`"/>
+				</property>
+			</composite-element>
+		</list>
+		<component name="fifthEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`fifthembedded_mystring`"/>
+			</property>
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+				<column not-null="false" unique="false" name="`fifthembedded_myinteger`"/>
+			</property>
+		</component>
+		<component name="alsoEmbeddable" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AlsoEmbeddableImpl">
+			<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`alsoembeddable_name`"/>
+			</property>
+		</component>
+		<component name="anotherEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AnotherEmbeddableImpl">
+			<property name="anotherName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`anotherembedded_anothername`"/>
+			</property>
+			<list name="aOneToMany" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+				<key update="true">
+					<column name="`anotherembeddable_aonetomany_e_id`" not-null="true" unique="false"/>
+				</key>
+				<list-index column="`anotherembeddable_aonetomany_idx`"/>
+				<composite-element class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AOneToManyImpl">
+					<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+						<column not-null="true" unique="false" name="`anotherembedded_name`"/>
+					</property>
+				</composite-element>
+			</list>
+			<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`anotherembedded_name`"/>
+			</property>
+		</component>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d2e188240
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,91 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbedderImpl" entity-name="Embedder" abstract="false" lazy="false" table="`embedder`">
+		<meta attribute="eclassName">Embedder</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embedded</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>
+		<component name="firstEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`columnstring3`"/>
+			</property>
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+				<column not-null="false" unique="false" name="`firstembedded_myinteger`"/>
+			</property>
+		</component>
+		<component name="secondEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`columnstring1`"/>
+			</property>
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+				<column not-null="false" unique="false" name="`columninteger1`"/>
+			</property>
+		</component>
+		<component name="thirdEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`columnstring2`"/>
+			</property>
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+				<column not-null="false" unique="false" name="`columninteger2`"/>
+			</property>
+		</component>
+		<list name="fourthEmbedded" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`embedder_fourthembedded_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`embedder_fourthembedded_idx`"/>
+			<composite-element class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
+				<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+					<column not-null="true" unique="false" name="`mystring`"/>
+				</property>
+				<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+					<column not-null="false" unique="false" name="`myinteger`"/>
+				</property>
+			</composite-element>
+		</list>
+		<component name="fifthEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
+			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`fifthembedded_mystring`"/>
+			</property>
+			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+				<column not-null="false" unique="false" name="`fifthembedded_myinteger`"/>
+			</property>
+		</component>
+		<component name="alsoEmbeddable" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AlsoEmbeddableImpl">
+			<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`alsoembeddable_name`"/>
+			</property>
+		</component>
+		<component name="anotherEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AnotherEmbeddableImpl">
+			<property name="anotherName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`anotherembedded_anothername`"/>
+			</property>
+			<list name="aOneToMany" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+				<key update="true">
+					<column name="`anotherembeddable_aonetomany_e_id`" not-null="true" unique="false"/>
+				</key>
+				<list-index column="`anotherembeddable_aonetomany_idx`"/>
+				<composite-element class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AOneToManyImpl">
+					<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+						<column not-null="true" unique="false" name="`anotherembedded_name`"/>
+					</property>
+				</composite-element>
+			</list>
+			<component name="nestedEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.NestedEmbeddableImpl">
+				<property name="nestedName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+					<column not-null="false" unique="false" name="`ne_nestedname`"/>
+				</property>
+			</component>
+			<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`anotherembedded_name`"/>
+			</property>
+		</component>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e85eb5305
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,26 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid</meta>
+		<composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-id>
+		<discriminator type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..22828e5f4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,23 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid</meta>
+		<composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-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="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..22828e5f4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,23 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid</meta>
+		<composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-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="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_xjoin_hibernate.hbm.xml
new file mode 100755
index 000000000..22828e5f4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_xjoin_hibernate.hbm.xml
@@ -0,0 +1,23 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid</meta>
+		<composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-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="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_xsingle_hibernate.hbm.xml
new file mode 100755
index 000000000..e85eb5305
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_xsingle_hibernate.hbm.xml
@@ -0,0 +1,26 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid</meta>
+		<composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-property name="lastName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-property>
+		</composite-id>
+		<discriminator type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b23c91454
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,39 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.entity.impl.BookImpl" entity-name="Boek" abstract="false" lazy="false" discriminator-value="Boek" table="`boek`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/entity</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 type="string">
+			<column name="dtype" index="boekdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.entity.impl.WriterImpl" entity-name="Schrijver" abstract="false" lazy="false" discriminator-value="Schrijver" table="`schrijver`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/entity</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 type="string">
+			<column name="dtype" index="schrijverdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..851c37f30
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,33 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.entity.impl.BookImpl" entity-name="Boek" abstract="false" lazy="false" table="`boek`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/entity</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.entity.impl.WriterImpl" entity-name="Schrijver" abstract="false" lazy="false" table="`schrijver`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/entity</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..851c37f30
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,33 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.entity.impl.BookImpl" entity-name="Boek" abstract="false" lazy="false" table="`boek`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/entity</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.entity.impl.WriterImpl" entity-name="Schrijver" abstract="false" lazy="false" table="`schrijver`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/entity</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4f13c8606
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,41 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.external.impl.ExternalTestImpl" entity-name="ExternalTest" abstract="false" lazy="false" discriminator-value="ExternalTest" table="`externaltest`">
+		<meta attribute="eclassName">ExternalTest</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/external</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 type="string">
+			<column name="dtype" index="externaltestdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="eObject" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<column not-null="false" unique="false" name="`eobject`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
+				<param name="eclassName">EObject</param>
+				<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+			</type>
+		</property>
+		<list name="eObjects" table="`externaltest_eobjects`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`externaltest_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`externaltest_eobjects_idx`"/>
+			<element>
+				<type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
+					<param name="eclassName">EObject</param>
+					<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+				</type>
+			</element>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e387ac0c6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.external.impl.ExternalTestImpl" entity-name="ExternalTest" abstract="false" lazy="false" table="`externaltest`">
+		<meta attribute="eclassName">ExternalTest</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/external</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="eObject" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<column not-null="false" unique="false" name="`eobject`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
+				<param name="eclassName">EObject</param>
+				<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+			</type>
+		</property>
+		<list name="eObjects" table="`externaltest_eobjects`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`externaltest_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`externaltest_eobjects_idx`"/>
+			<element>
+				<type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
+					<param name="eclassName">EObject</param>
+					<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+				</type>
+			</element>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e387ac0c6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.external.impl.ExternalTestImpl" entity-name="ExternalTest" abstract="false" lazy="false" table="`externaltest`">
+		<meta attribute="eclassName">ExternalTest</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/external</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="eObject" lazy="false" insert="true" update="true" not-null="false" unique="false">
+			<column not-null="false" unique="false" name="`eobject`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
+				<param name="eclassName">EObject</param>
+				<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+			</type>
+		</property>
+		<list name="eObjects" table="`externaltest_eobjects`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`externaltest_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`externaltest_eobjects_idx`"/>
+			<element>
+				<type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
+					<param name="eclassName">EObject</param>
+					<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+				</type>
+			</element>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8f6da5032
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,46 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/extralazy</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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<list name="authors" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="book_authors">
+				<column name="`book_authors_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_authors_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/extralazy</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..da5f38c1e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,40 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/extralazy</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<list name="authors" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="book_authors">
+				<column name="`book_authors_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_authors_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/extralazy</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..160cb73d2
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,40 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/extralazy</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<list name="authors" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="book_authors">
+				<column name="`book_authors_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_authors_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/extralazy</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..3955997ec
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,61 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl.RoleImpl" entity-name="Role" abstract="false" lazy="false" discriminator-value="Role" table="`role`">
+		<meta attribute="eclassName">Role</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/Forcedidbag</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 type="string">
+			<column name="dtype" index="roledtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<idbag name="users" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`role_user`">
+			<collection-id column="idbag_id" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`role_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="User" unique="false" foreign-key="role_users">
+				<column name="`user_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</idbag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" discriminator-value="User" table="`user`">
+		<meta attribute="eclassName">User</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/Forcedidbag</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 type="string">
+			<column name="dtype" index="userdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<idbag name="roles" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`myjoin`">
+			<collection-id column="idbag_id" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`user_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Role" unique="false" foreign-key="user_roles">
+				<column name="`role_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</idbag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f771ed9de
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,55 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl.RoleImpl" entity-name="Role" abstract="false" lazy="false" table="`role`">
+		<meta attribute="eclassName">Role</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/Forcedidbag</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<idbag name="users" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`role_user`">
+			<collection-id column="idbag_id" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`role_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="User" unique="false" foreign-key="role_users">
+				<column name="`user_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</idbag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" table="`user`">
+		<meta attribute="eclassName">User</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/Forcedidbag</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<idbag name="roles" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`myjoin`">
+			<collection-id column="idbag_id" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`user_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Role" unique="false" foreign-key="user_roles">
+				<column name="`role_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</idbag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f771ed9de
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,55 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl.RoleImpl" entity-name="Role" abstract="false" lazy="false" table="`role`">
+		<meta attribute="eclassName">Role</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/Forcedidbag</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<idbag name="users" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`role_user`">
+			<collection-id column="idbag_id" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`role_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="User" unique="false" foreign-key="role_users">
+				<column name="`user_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</idbag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" table="`user`">
+		<meta attribute="eclassName">User</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/Forcedidbag</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<idbag name="roles" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`myjoin`">
+			<collection-id column="idbag_id" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`user_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Role" unique="false" foreign-key="user_roles">
+				<column name="`role_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</idbag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..102adf6fa
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,77 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<map name="writersByName" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_writersbyname">
+				<column name="`join_column_writer`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String">
+				<column not-null="false" unique="false" name="`thenameofthewriter`"/>
+			</map-key>
+			<one-to-many entity-name="Writer"/>
+		</map>
+		<map name="cityByWriter" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_citybywriter">
+				<column name="`join_column_city`" not-null="false" unique="false"/>
+			</key>
+			<map-key-many-to-many entity-name="Writer">
+				<column not-null="true" unique="false" name="`the_citywriter_id`"/>
+			</map-key-many-to-many>
+			<one-to-many entity-name="City"/>
+		</map>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.CityImpl" entity-name="City" abstract="false" lazy="false" discriminator-value="City" table="`city`">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</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 type="string">
+			<column name="dtype" index="citydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="cityWriter" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="city_citywriter" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`the_citywriter_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`thenameofthewriter`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c9f2b5e6f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,68 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<map name="writersByName" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_writersbyname">
+				<column name="`join_column_writer`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String">
+				<column not-null="false" unique="false" name="`thenameofthewriter`"/>
+			</map-key>
+			<one-to-many entity-name="Writer"/>
+		</map>
+		<map name="cityByWriter" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_citybywriter">
+				<column name="`join_column_city`" not-null="false" unique="false"/>
+			</key>
+			<map-key-many-to-many entity-name="Writer">
+				<column not-null="true" unique="false" name="`the_citywriter_id`"/>
+			</map-key-many-to-many>
+			<one-to-many entity-name="City"/>
+		</map>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.CityImpl" entity-name="City" abstract="false" lazy="false" table="`city`">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="cityWriter" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="city_citywriter" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`the_citywriter_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`thenameofthewriter`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c9f2b5e6f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,68 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<map name="writersByName" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_writersbyname">
+				<column name="`join_column_writer`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String">
+				<column not-null="false" unique="false" name="`thenameofthewriter`"/>
+			</map-key>
+			<one-to-many entity-name="Writer"/>
+		</map>
+		<map name="cityByWriter" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_citybywriter">
+				<column name="`join_column_city`" not-null="false" unique="false"/>
+			</key>
+			<map-key-many-to-many entity-name="Writer">
+				<column not-null="true" unique="false" name="`the_citywriter_id`"/>
+			</map-key-many-to-many>
+			<one-to-many entity-name="City"/>
+		</map>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.CityImpl" entity-name="City" abstract="false" lazy="false" table="`city`">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="cityWriter" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="city_citywriter" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`the_citywriter_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`thenameofthewriter`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6715ef6d7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,103 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.IdentityIDImpl" entity-name="IdentityID" abstract="false" lazy="false" discriminator-value="IdentityID" table="`identityid`">
+		<meta attribute="eclassName">IdentityID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="identity"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="identityiddtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.SimpleIDImpl" entity-name="SimpleID" abstract="false" lazy="false" discriminator-value="SimpleID" table="`simpleid`">
+		<meta attribute="eclassName">SimpleID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="autoID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`autod`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="simpleiddtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableIDImpl" entity-name="TableID" abstract="false" lazy="false" discriminator-value="TableID" table="`tableid`">
+		<meta attribute="eclassName">TableID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="hilo">
+				<param name="table">uid_table</param>
+				<param name="column">next_hi_value_column</param>
+			</generator>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="tableiddtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl" entity-name="TableGeneratorID" abstract="false" lazy="false" discriminator-value="TableGeneratorID" table="`tablegeneratorid`">
+		<meta attribute="eclassName">TableGeneratorID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="hilo">
+				<param name="table">TGEN</param>
+				<param name="column">VAL_COL</param>
+				<param name="max_lo">49</param>
+			</generator>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="tablegeneratoriddtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.AutoIDImpl" entity-name="AutoID" abstract="false" lazy="false" discriminator-value="AutoID" table="`autoid`">
+		<meta attribute="eclassName">AutoID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="autoID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`autoid`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="autoiddtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.OtherTableGeneratorIDImpl" entity-name="OtherTableGeneratorID" abstract="false" lazy="false" discriminator-value="OtherTableGeneratorID" table="`othertablegeneratorid`">
+		<meta attribute="eclassName">OtherTableGeneratorID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="hilo">
+				<param name="table">OTHERTGEN</param>
+				<param name="column">VAL_COL</param>
+				<param name="max_lo">49</param>
+			</generator>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="othertablegeneratoriddtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b71c3c73c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.IdentityIDImpl" entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`">
+		<meta attribute="eclassName">IdentityID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="identity"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.SimpleIDImpl" entity-name="SimpleID" abstract="false" lazy="false" table="`simpleid`">
+		<meta attribute="eclassName">SimpleID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="autoID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`autod`"/>
+			<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>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableIDImpl" entity-name="TableID" abstract="false" lazy="false" table="`tableid`">
+		<meta attribute="eclassName">TableID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="hilo">
+				<param name="table">uid_table</param>
+				<param name="column">next_hi_value_column</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl" entity-name="TableGeneratorID" abstract="false" lazy="false" table="`tablegeneratorid`">
+		<meta attribute="eclassName">TableGeneratorID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="hilo">
+				<param name="table">TGEN</param>
+				<param name="column">VAL_COL</param>
+				<param name="max_lo">49</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.AutoIDImpl" entity-name="AutoID" abstract="false" lazy="false" table="`autoid`">
+		<meta attribute="eclassName">AutoID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="autoID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`autoid`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.OtherTableGeneratorIDImpl" entity-name="OtherTableGeneratorID" abstract="false" lazy="false" table="`othertablegeneratorid`">
+		<meta attribute="eclassName">OtherTableGeneratorID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="hilo">
+				<param name="table">OTHERTGEN</param>
+				<param name="column">VAL_COL</param>
+				<param name="max_lo">49</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b71c3c73c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.IdentityIDImpl" entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`">
+		<meta attribute="eclassName">IdentityID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="identity"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.SimpleIDImpl" entity-name="SimpleID" abstract="false" lazy="false" table="`simpleid`">
+		<meta attribute="eclassName">SimpleID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="autoID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`autod`"/>
+			<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>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableIDImpl" entity-name="TableID" abstract="false" lazy="false" table="`tableid`">
+		<meta attribute="eclassName">TableID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="hilo">
+				<param name="table">uid_table</param>
+				<param name="column">next_hi_value_column</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl" entity-name="TableGeneratorID" abstract="false" lazy="false" table="`tablegeneratorid`">
+		<meta attribute="eclassName">TableGeneratorID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="hilo">
+				<param name="table">TGEN</param>
+				<param name="column">VAL_COL</param>
+				<param name="max_lo">49</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.AutoIDImpl" entity-name="AutoID" abstract="false" lazy="false" table="`autoid`">
+		<meta attribute="eclassName">AutoID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="autoID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`autoid`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.OtherTableGeneratorIDImpl" entity-name="OtherTableGeneratorID" abstract="false" lazy="false" table="`othertablegeneratorid`">
+		<meta attribute="eclassName">OtherTableGeneratorID</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
+		<id name="myid" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+			<generator class="hilo">
+				<param name="table">OTHERTGEN</param>
+				<param name="column">VAL_COL</param>
+				<param name="max_lo">49</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a9fe620e5
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,31 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" discriminator-value="User" table="`user`">
+		<meta attribute="eclassName">User</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/idbag</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 type="string">
+			<column name="dtype" index="userdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<idbag name="roles" table="`user_roles`" lazy="true" cascade="all,delete-orphan">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`user_roles_e_id`" not-null="true" unique="false"/>
+			</key>
+			<element type="java.lang.String"/>
+		</idbag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..26a9bfb13
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,28 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" table="`user`">
+		<meta attribute="eclassName">User</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/idbag</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<idbag name="roles" table="`user_roles`" lazy="true" cascade="all,delete-orphan">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`user_roles_e_id`" not-null="true" unique="false"/>
+			</key>
+			<element type="java.lang.String"/>
+		</idbag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2c7ab85db
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,51 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/idbag</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" table="`user`">
+		<meta attribute="eclassName">User</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/idbag</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<idbag name="roles" table="`user_roles`" lazy="true" cascade="all,delete-orphan">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`user_roles_e_id`" not-null="true" unique="false"/>
+			</key>
+			<element type="java.lang.String"/>
+		</idbag>
+		<idbag name="addresses" lazy="true" cascade="all,delete-orphan">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true" foreign-key="user_addresses">
+				<column name="`user_addresses_e_id`" not-null="false" unique="false"/>
+			</key>
+			<many-to-many entity-name="Address"/>
+		</idbag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_xjoin_hibernate.hbm.xml
new file mode 100755
index 000000000..26a9bfb13
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_xjoin_hibernate.hbm.xml
@@ -0,0 +1,28 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" table="`user`">
+		<meta attribute="eclassName">User</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/idbag</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<idbag name="roles" table="`user_roles`" lazy="true" cascade="all,delete-orphan">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`user_roles_e_id`" not-null="true" unique="false"/>
+			</key>
+			<element type="java.lang.String"/>
+		</idbag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_xsingle_hibernate.hbm.xml
new file mode 100755
index 000000000..a9fe620e5
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_xsingle_hibernate.hbm.xml
@@ -0,0 +1,31 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" discriminator-value="User" table="`user`">
+		<meta attribute="eclassName">User</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/idbag</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 type="string">
+			<column name="dtype" index="userdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<idbag name="roles" table="`user_roles`" lazy="true" cascade="all,delete-orphan">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`user_roles_e_id`" not-null="true" unique="false"/>
+			</key>
+			<element type="java.lang.String"/>
+		</idbag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4ef4e5b86
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,186 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" discriminator-value="ContentList" table="`contentlist`">
+		<meta attribute="eclassName">ContentList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="contentlistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_address">
+				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_price">
+				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_price_idx`"/>
+			<one-to-many entity-name="Price"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName">UKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName">DistrictUKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`ukaddress_name`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
+		<meta attribute="eclassName">Price</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="DISCRIMINATOR" index="discrIndex,ohterindex" length="120"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
+		<meta attribute="eclassName">InternationalPrice</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
+		<meta attribute="eclassName">Customer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
+		<meta attribute="eclassName">SpecificCustomer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`specificname`"/>
+		</property>
+	</union-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" discriminator-value="UKAddressList" table="`ukaddresslist`">
+		<meta attribute="eclassName">UKAddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ukaddresslistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="ukaddresslist_address">
+				<column name="`ukaddresslist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ukaddresslist_address_idx`"/>
+			<one-to-many entity-name="UKAddress"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" discriminator-value="ParentOne" table="`parentone`">
+		<meta attribute="eclassName">ParentOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="dtype" index="parentonedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" discriminator-value="ParentTwo" table="`parenttwo`">
+		<meta attribute="eclassName">ParentTwo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="dtype" index="parenttwodtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" discriminator-value="ChildOne">
+		<meta attribute="eclassName">ChildOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..41053b1c3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,177 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" table="`contentlist`">
+		<meta attribute="eclassName">ContentList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_address">
+				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_price">
+				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_price_idx`"/>
+			<one-to-many entity-name="Price"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName">UKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName">DistrictUKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`ukaddress_name`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
+		<meta attribute="eclassName">Price</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="DISCRIMINATOR" index="discrIndex,ohterindex" length="120"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
+		<meta attribute="eclassName">InternationalPrice</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
+		<meta attribute="eclassName">Customer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
+		<meta attribute="eclassName">SpecificCustomer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`specificname`"/>
+		</property>
+	</union-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" table="`ukaddresslist`">
+		<meta attribute="eclassName">UKAddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="ukaddresslist_address">
+				<column name="`ukaddresslist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ukaddresslist_address_idx`"/>
+			<one-to-many entity-name="UKAddress"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" table="`parentone`">
+		<meta attribute="eclassName">ParentOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" table="`parenttwo`">
+		<meta attribute="eclassName">ParentTwo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" table="`childone`">
+		<meta attribute="eclassName">ChildOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`parentone_e_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..41053b1c3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,177 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" table="`contentlist`">
+		<meta attribute="eclassName">ContentList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_address">
+				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_price">
+				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_price_idx`"/>
+			<one-to-many entity-name="Price"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName">UKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName">DistrictUKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`ukaddress_name`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
+		<meta attribute="eclassName">Price</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="DISCRIMINATOR" index="discrIndex,ohterindex" length="120"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
+		<meta attribute="eclassName">InternationalPrice</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
+		<meta attribute="eclassName">Customer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
+		<meta attribute="eclassName">SpecificCustomer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`specificname`"/>
+		</property>
+	</union-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" table="`ukaddresslist`">
+		<meta attribute="eclassName">UKAddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="ukaddresslist_address">
+				<column name="`ukaddresslist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ukaddresslist_address_idx`"/>
+			<one-to-many entity-name="UKAddress"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" table="`parentone`">
+		<meta attribute="eclassName">ParentOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" table="`parenttwo`">
+		<meta attribute="eclassName">ParentTwo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" table="`childone`">
+		<meta attribute="eclassName">ChildOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`parentone_e_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_xjoin_hibernate.hbm.xml
new file mode 100755
index 000000000..86a59879b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_xjoin_hibernate.hbm.xml
@@ -0,0 +1,188 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" table="`contentlist`">
+		<meta attribute="eclassName">ContentList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_address">
+				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_price">
+				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_price_idx`"/>
+			<one-to-many entity-name="Price"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName">UKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName">DistrictUKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`ukaddress_name`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
+		<meta attribute="eclassName">Price</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="DISCRIMINATOR" index="mypriceDISCRIMINATOR" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
+		<meta attribute="eclassName">InternationalPrice</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
+		<meta attribute="eclassName">Customer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
+		<meta attribute="eclassName">SpecificCustomer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`customer_e_id`"/>
+		</key>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`specificname`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" table="`ukaddresslist`">
+		<meta attribute="eclassName">UKAddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="ukaddresslist_address">
+				<column name="`ukaddresslist_address_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ukaddresslist_address_idx`"/>
+			<one-to-many entity-name="UKAddress"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" table="`parentone`">
+		<meta attribute="eclassName">ParentOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" table="`parenttwo`">
+		<meta attribute="eclassName">ParentTwo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentTwo" table="`childone`">
+		<meta attribute="eclassName">ChildOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`parentone_e_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_xsingle_hibernate.hbm.xml
new file mode 100755
index 000000000..84ead78d0
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_xsingle_hibernate.hbm.xml
@@ -0,0 +1,197 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" discriminator-value="ContentList" table="`contentlist`">
+		<meta attribute="eclassName">ContentList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="contentlistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_address">
+				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_price">
+				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_price_idx`"/>
+			<one-to-many entity-name="Price"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName">UKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName">DistrictUKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`ukaddress_name`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
+		<meta attribute="eclassName">Price</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="DISCRIMINATOR" index="mypriceDISCRIMINATOR" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
+		<meta attribute="eclassName">InternationalPrice</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" discriminator-value="Customer" table="`customer`">
+		<meta attribute="eclassName">Customer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="dtype" index="customerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" discriminator-value="SpecificCustomer">
+		<meta attribute="eclassName">SpecificCustomer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`specificname`"/>
+		</property>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" discriminator-value="UKAddressList" table="`ukaddresslist`">
+		<meta attribute="eclassName">UKAddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="dtype" index="ukaddresslistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="ukaddresslist_address">
+				<column name="`ukaddresslist_address_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ukaddresslist_address_idx`"/>
+			<one-to-many entity-name="UKAddress"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" discriminator-value="ParentOne" table="`parentone`">
+		<meta attribute="eclassName">ParentOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="dtype" index="parentonedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" discriminator-value="ParentTwo" table="`parenttwo`">
+		<meta attribute="eclassName">ParentTwo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="dtype" index="parenttwodtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentTwo" discriminator-value="ChildOne">
+		<meta attribute="eclassName">ChildOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4ef4e5b86
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,186 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" discriminator-value="ContentList" table="`contentlist`">
+		<meta attribute="eclassName">ContentList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="contentlistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_address">
+				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_price">
+				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_price_idx`"/>
+			<one-to-many entity-name="Price"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName">UKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName">DistrictUKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`ukaddress_name`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
+		<meta attribute="eclassName">Price</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="DISCRIMINATOR" index="discrIndex,ohterindex" length="120"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
+		<meta attribute="eclassName">InternationalPrice</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
+		<meta attribute="eclassName">Customer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
+		<meta attribute="eclassName">SpecificCustomer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`specificname`"/>
+		</property>
+	</union-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" discriminator-value="UKAddressList" table="`ukaddresslist`">
+		<meta attribute="eclassName">UKAddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ukaddresslistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="ukaddresslist_address">
+				<column name="`ukaddresslist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ukaddresslist_address_idx`"/>
+			<one-to-many entity-name="UKAddress"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" discriminator-value="ParentOne" table="`parentone`">
+		<meta attribute="eclassName">ParentOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="dtype" index="parentonedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" discriminator-value="ParentTwo" table="`parenttwo`">
+		<meta attribute="eclassName">ParentTwo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="dtype" index="parenttwodtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" discriminator-value="ChildOne">
+		<meta attribute="eclassName">ChildOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..41053b1c3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,177 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" table="`contentlist`">
+		<meta attribute="eclassName">ContentList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_address">
+				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_price">
+				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_price_idx`"/>
+			<one-to-many entity-name="Price"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName">UKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName">DistrictUKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`ukaddress_name`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
+		<meta attribute="eclassName">Price</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="DISCRIMINATOR" index="discrIndex,ohterindex" length="120"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
+		<meta attribute="eclassName">InternationalPrice</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
+		<meta attribute="eclassName">Customer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
+		<meta attribute="eclassName">SpecificCustomer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`specificname`"/>
+		</property>
+	</union-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" table="`ukaddresslist`">
+		<meta attribute="eclassName">UKAddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="ukaddresslist_address">
+				<column name="`ukaddresslist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ukaddresslist_address_idx`"/>
+			<one-to-many entity-name="UKAddress"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" table="`parentone`">
+		<meta attribute="eclassName">ParentOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" table="`parenttwo`">
+		<meta attribute="eclassName">ParentTwo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" table="`childone`">
+		<meta attribute="eclassName">ChildOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`parentone_e_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..41053b1c3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,177 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" table="`contentlist`">
+		<meta attribute="eclassName">ContentList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_address">
+				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_price">
+				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_price_idx`"/>
+			<one-to-many entity-name="Price"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName">UKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName">DistrictUKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`ukaddress_name`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
+		<meta attribute="eclassName">Price</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="DISCRIMINATOR" index="discrIndex,ohterindex" length="120"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
+		<meta attribute="eclassName">InternationalPrice</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
+		<meta attribute="eclassName">Customer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
+		<meta attribute="eclassName">SpecificCustomer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`specificname`"/>
+		</property>
+	</union-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" table="`ukaddresslist`">
+		<meta attribute="eclassName">UKAddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="ukaddresslist_address">
+				<column name="`ukaddresslist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ukaddresslist_address_idx`"/>
+			<one-to-many entity-name="UKAddress"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" table="`parentone`">
+		<meta attribute="eclassName">ParentOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" table="`parenttwo`">
+		<meta attribute="eclassName">ParentTwo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" table="`childone`">
+		<meta attribute="eclassName">ChildOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`parentone_e_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_xjoin_hibernate.hbm.xml
new file mode 100755
index 000000000..efcbd7bb6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_xjoin_hibernate.hbm.xml
@@ -0,0 +1,181 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" table="`contentlist`">
+		<meta attribute="eclassName">ContentList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_address">
+				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_price">
+				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_price_idx`"/>
+			<one-to-many entity-name="Price"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName">UKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName">DistrictUKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`ukaddress_name`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" table="`myprice`">
+		<meta attribute="eclassName">Price</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" table="`internationalprice`">
+		<meta attribute="eclassName">InternationalPrice</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`currency`"/>
+		</property>
+	</union-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
+		<meta attribute="eclassName">Customer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
+		<meta attribute="eclassName">SpecificCustomer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`customer_e_id`"/>
+		</key>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`specificname`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" table="`ukaddresslist`">
+		<meta attribute="eclassName">UKAddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="ukaddresslist_address">
+				<column name="`ukaddresslist_address_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ukaddresslist_address_idx`"/>
+			<one-to-many entity-name="UKAddress"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" table="`parentone`">
+		<meta attribute="eclassName">ParentOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" table="`parenttwo`">
+		<meta attribute="eclassName">ParentTwo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" table="`childone`">
+		<meta attribute="eclassName">ChildOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`parentone_e_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_xsingle_hibernate.hbm.xml
new file mode 100755
index 000000000..66184f2ba
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_xsingle_hibernate.hbm.xml
@@ -0,0 +1,190 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" discriminator-value="ContentList" table="`contentlist`">
+		<meta attribute="eclassName">ContentList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="contentlistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_address">
+				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_price">
+				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_price_idx`"/>
+			<one-to-many entity-name="Price"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName">UKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName">DistrictUKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`ukaddress_name`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" table="`myprice`">
+		<meta attribute="eclassName">Price</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" table="`internationalprice`">
+		<meta attribute="eclassName">InternationalPrice</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`currency`"/>
+		</property>
+	</union-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" discriminator-value="Customer" table="`customer`">
+		<meta attribute="eclassName">Customer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="dtype" index="customerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" discriminator-value="SpecificCustomer">
+		<meta attribute="eclassName">SpecificCustomer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`specificname`"/>
+		</property>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" discriminator-value="UKAddressList" table="`ukaddresslist`">
+		<meta attribute="eclassName">UKAddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="dtype" index="ukaddresslistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="ukaddresslist_address">
+				<column name="`ukaddresslist_address_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ukaddresslist_address_idx`"/>
+			<one-to-many entity-name="UKAddress"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" discriminator-value="ParentOne" table="`parentone`">
+		<meta attribute="eclassName">ParentOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="dtype" index="parentonedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" discriminator-value="ParentTwo" table="`parenttwo`">
+		<meta attribute="eclassName">ParentTwo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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 type="string">
+			<column name="dtype" index="parenttwodtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" discriminator-value="ChildOne">
+		<meta attribute="eclassName">ChildOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..506985450
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,53 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SuperImpl" entity-name="Super" abstract="false" lazy="false" discriminator-value="80248667" table="`super_table`">
+		<meta attribute="eclassName">Super</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</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 type="integer">
+			<column name="DISC" index="SUPER_TABLEDISC" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SubImpl" entity-name="Sub" abstract="false" lazy="false" extends="Super" discriminator-value="83488">
+		<meta attribute="eclassName">Sub</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.OtherSubImpl" entity-name="OtherSub" abstract="false" lazy="false" extends="Super" discriminator-value="500">
+		<meta attribute="eclassName">OtherSub</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
+	</subclass>
+	<subclass entity-name="AbstractSub" abstract="true" lazy="false" extends="Super" discriminator-value="950694558">
+		<meta attribute="eclassName">AbstractSub</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SuperFormulaImpl" entity-name="SuperFormula" abstract="false" lazy="false" discriminator-value="1" table="`superformula`">
+		<meta attribute="eclassName">SuperFormula</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</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 formula="case when name like 'R%' then 0 when name like 'G%' then 1 else 2 end"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SubFormulaImpl" entity-name="SubFormula" abstract="false" lazy="false" extends="SuperFormula" discriminator-value="0">
+		<meta attribute="eclassName">SubFormula</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..506985450
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,53 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SuperImpl" entity-name="Super" abstract="false" lazy="false" discriminator-value="80248667" table="`super_table`">
+		<meta attribute="eclassName">Super</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</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 type="integer">
+			<column name="DISC" index="SUPER_TABLEDISC" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SubImpl" entity-name="Sub" abstract="false" lazy="false" extends="Super" discriminator-value="83488">
+		<meta attribute="eclassName">Sub</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.OtherSubImpl" entity-name="OtherSub" abstract="false" lazy="false" extends="Super" discriminator-value="500">
+		<meta attribute="eclassName">OtherSub</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
+	</subclass>
+	<subclass entity-name="AbstractSub" abstract="true" lazy="false" extends="Super" discriminator-value="950694558">
+		<meta attribute="eclassName">AbstractSub</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SuperFormulaImpl" entity-name="SuperFormula" abstract="false" lazy="false" discriminator-value="1" table="`superformula`">
+		<meta attribute="eclassName">SuperFormula</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</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 formula="case when name like 'R%' then 0 when name like 'G%' then 1 else 2 end"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SubFormulaImpl" entity-name="SubFormula" abstract="false" lazy="false" extends="SuperFormula" discriminator-value="0">
+		<meta attribute="eclassName">SubFormula</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..506985450
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,53 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SuperImpl" entity-name="Super" abstract="false" lazy="false" discriminator-value="80248667" table="`super_table`">
+		<meta attribute="eclassName">Super</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</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 type="integer">
+			<column name="DISC" index="SUPER_TABLEDISC" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SubImpl" entity-name="Sub" abstract="false" lazy="false" extends="Super" discriminator-value="83488">
+		<meta attribute="eclassName">Sub</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.OtherSubImpl" entity-name="OtherSub" abstract="false" lazy="false" extends="Super" discriminator-value="500">
+		<meta attribute="eclassName">OtherSub</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
+	</subclass>
+	<subclass entity-name="AbstractSub" abstract="true" lazy="false" extends="Super" discriminator-value="950694558">
+		<meta attribute="eclassName">AbstractSub</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SuperFormulaImpl" entity-name="SuperFormula" abstract="false" lazy="false" discriminator-value="1" table="`superformula`">
+		<meta attribute="eclassName">SuperFormula</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</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 formula="case when name like 'R%' then 0 when name like 'G%' then 1 else 2 end"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SubFormulaImpl" entity-name="SubFormula" abstract="false" lazy="false" extends="SuperFormula" discriminator-value="0">
+		<meta attribute="eclassName">SubFormula</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d3cc89d96
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,95 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="lazy.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.lazy.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="false" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="false" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..091eb79b0
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,86 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="lazy.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.lazy.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="false" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="false" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..091eb79b0
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,86 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="lazy.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.lazy.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" lazy="false" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="false" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..84d1215d0
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,27 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+		<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
+			<column not-null="false" unique="false" name="`photo`" length="1000000"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2d0258238
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,24 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+		<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
+			<column not-null="false" unique="false" name="`photo`" length="1000000"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2d0258238
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,24 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+		<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
+			<column not-null="false" unique="false" name="`photo`" length="1000000"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_xjoin_hibernate.hbm.xml
new file mode 100755
index 000000000..26b334b3b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_xjoin_hibernate.hbm.xml
@@ -0,0 +1,28 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob</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="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`id`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+		<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
+			<column not-null="false" unique="false" name="`photo`" length="1000000"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_xsingle_hibernate.hbm.xml
new file mode 100755
index 000000000..21361fc82
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_xsingle_hibernate.hbm.xml
@@ -0,0 +1,31 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob</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 type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`id`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`address`"/>
+		</property>
+		<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
+			<column not-null="false" unique="false" name="`photo`" length="1000000"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..69fb86755
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,81 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.CntrImpl" entity-name="Cntr" abstract="false" lazy="false" discriminator-value="Cntr" table="`cntr`">
+		<meta attribute="eclassName">Cntr</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</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 type="string">
+			<column name="dtype" index="cntrdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<bag name="rght" lazy="false" cascade="merge,persist,save-update,lock" table="`rightcenter`">
+			<key update="true">
+				<column name="`cntr_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Rght" unique="false" foreign-key="cntr_rght">
+				<column name="`rght_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<list name="lft" lazy="false" cascade="merge,persist,save-update,lock" table="`cntr_lft`">
+			<key update="true">
+				<column name="`cntr_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`cntr_lft_idx`"/>
+			<many-to-many entity-name="Lft" unique="false" foreign-key="cntr_lft">
+				<column name="`lft_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.LftImpl" entity-name="Lft" abstract="false" lazy="false" discriminator-value="Lft" table="`lft`">
+		<meta attribute="eclassName">Lft</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</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 type="string">
+			<column name="dtype" index="lftdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="cntr" lazy="true" cascade="merge,persist,save-update,lock" table="`lft_cntr`">
+			<key update="true">
+				<column name="`lft_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`lft_cntr_idx`"/>
+			<many-to-many entity-name="Cntr" unique="false" foreign-key="lft_cntr">
+				<column name="`cntr_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.RghtImpl" entity-name="Rght" abstract="false" lazy="false" discriminator-value="Rght" table="`rght`">
+		<meta attribute="eclassName">Rght</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</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 type="string">
+			<column name="dtype" index="rghtdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<bag name="cntr" lazy="true" cascade="merge,persist,save-update,lock" inverse="true" table="`rightcenter`">
+			<key update="true">
+				<column name="`rght_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Cntr" unique="false" foreign-key="rght_cntr">
+				<column name="`cntr_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fc0b8598d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,72 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.CntrImpl" entity-name="Cntr" abstract="false" lazy="false" table="`cntr`">
+		<meta attribute="eclassName">Cntr</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</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>
+		<bag name="rght" lazy="false" cascade="merge,persist,save-update,lock" table="`rightcenter`">
+			<key update="true">
+				<column name="`cntr_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Rght" unique="false" foreign-key="cntr_rght">
+				<column name="`rght_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<list name="lft" lazy="false" cascade="merge,persist,save-update,lock" table="`cntr_lft`">
+			<key update="true">
+				<column name="`cntr_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`cntr_lft_idx`"/>
+			<many-to-many entity-name="Lft" unique="false" foreign-key="cntr_lft">
+				<column name="`lft_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.LftImpl" entity-name="Lft" abstract="false" lazy="false" table="`lft`">
+		<meta attribute="eclassName">Lft</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</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="cntr" lazy="true" cascade="merge,persist,save-update,lock" table="`lft_cntr`">
+			<key update="true">
+				<column name="`lft_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`lft_cntr_idx`"/>
+			<many-to-many entity-name="Cntr" unique="false" foreign-key="lft_cntr">
+				<column name="`cntr_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.RghtImpl" entity-name="Rght" abstract="false" lazy="false" table="`rght`">
+		<meta attribute="eclassName">Rght</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</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>
+		<bag name="cntr" lazy="true" cascade="merge,persist,save-update,lock" inverse="true" table="`rightcenter`">
+			<key update="true">
+				<column name="`rght_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Cntr" unique="false" foreign-key="rght_cntr">
+				<column name="`cntr_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fc0b8598d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,72 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.CntrImpl" entity-name="Cntr" abstract="false" lazy="false" table="`cntr`">
+		<meta attribute="eclassName">Cntr</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</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>
+		<bag name="rght" lazy="false" cascade="merge,persist,save-update,lock" table="`rightcenter`">
+			<key update="true">
+				<column name="`cntr_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Rght" unique="false" foreign-key="cntr_rght">
+				<column name="`rght_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<list name="lft" lazy="false" cascade="merge,persist,save-update,lock" table="`cntr_lft`">
+			<key update="true">
+				<column name="`cntr_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`cntr_lft_idx`"/>
+			<many-to-many entity-name="Lft" unique="false" foreign-key="cntr_lft">
+				<column name="`lft_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.LftImpl" entity-name="Lft" abstract="false" lazy="false" table="`lft`">
+		<meta attribute="eclassName">Lft</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</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="cntr" lazy="true" cascade="merge,persist,save-update,lock" table="`lft_cntr`">
+			<key update="true">
+				<column name="`lft_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`lft_cntr_idx`"/>
+			<many-to-many entity-name="Cntr" unique="false" foreign-key="lft_cntr">
+				<column name="`cntr_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.RghtImpl" entity-name="Rght" abstract="false" lazy="false" table="`rght`">
+		<meta attribute="eclassName">Rght</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</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>
+		<bag name="cntr" lazy="true" cascade="merge,persist,save-update,lock" inverse="true" table="`rightcenter`">
+			<key update="true">
+				<column name="`rght_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Cntr" unique="false" foreign-key="rght_cntr">
+				<column name="`cntr_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f3257d236
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,46 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`BOOK`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mapkey</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 type="string">
+			<column name="DTYPE" index="BOOKDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`TITLE`"/>
+		</property>
+		<map name="writers" where="name='martin'" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="BOOK_WRITERS">
+				<column name="`BOOK_WRITERS_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<map-key column="`NAME`" type="java.lang.String"/>
+			<one-to-many entity-name="Writer"/>
+		</map>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`WRITER`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mapkey</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 type="string">
+			<column name="DTYPE" index="WRITERDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a3349280a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,40 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`BOOK`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mapkey</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`TITLE`"/>
+		</property>
+		<map name="writers" where="name='martin'" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="BOOK_WRITERS">
+				<column name="`BOOK_WRITERS_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<map-key column="`NAME`" type="java.lang.String"/>
+			<one-to-many entity-name="Writer"/>
+		</map>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`WRITER`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mapkey</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a3349280a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,40 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`BOOK`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mapkey</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`TITLE`"/>
+		</property>
+		<map name="writers" where="name='martin'" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="BOOK_WRITERS">
+				<column name="`BOOK_WRITERS_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<map-key column="`NAME`" type="java.lang.String"/>
+			<one-to-many entity-name="Writer"/>
+		</map>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`WRITER`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mapkey</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a92764da5
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,50 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.AddIDDocumentImpl" entity-name="AddIDDocument" abstract="false" lazy="false" discriminator-value="AddIDDocument" table="`addiddocument`">
+		<meta attribute="eclassName">AddIDDocument</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="dtype" index="addiddocumentdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`mygenericinfo`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.SpecificDocumentImpl" entity-name="SpecificDocument" abstract="false" lazy="false" discriminator-value="SpecificDocument" table="`specificdocument`">
+		<meta attribute="eclassName">SpecificDocument</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="dtype" index="specificdocumentdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`mygenericinfo`"/>
+		</property>
+		<property name="myName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`parentdocument_name`" length="50"/>
+		</property>
+		<property name="mySpecificInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`myspecificinfo`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e4029ef12
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,44 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.AddIDDocumentImpl" entity-name="AddIDDocument" abstract="false" lazy="false" table="`addiddocument`">
+		<meta attribute="eclassName">AddIDDocument</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass</meta>
+		<cache usage="read-write"/>
+		<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="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`mygenericinfo`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.SpecificDocumentImpl" entity-name="SpecificDocument" abstract="false" lazy="false" table="`specificdocument`">
+		<meta attribute="eclassName">SpecificDocument</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass</meta>
+		<cache usage="read-write"/>
+		<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="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`mygenericinfo`"/>
+		</property>
+		<property name="myName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`parentdocument_name`" length="50"/>
+		</property>
+		<property name="mySpecificInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`myspecificinfo`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e4029ef12
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,44 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.AddIDDocumentImpl" entity-name="AddIDDocument" abstract="false" lazy="false" table="`addiddocument`">
+		<meta attribute="eclassName">AddIDDocument</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass</meta>
+		<cache usage="read-write"/>
+		<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="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`mygenericinfo`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.SpecificDocumentImpl" entity-name="SpecificDocument" abstract="false" lazy="false" table="`specificdocument`">
+		<meta attribute="eclassName">SpecificDocument</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass</meta>
+		<cache usage="read-write"/>
+		<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="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`mygenericinfo`"/>
+		</property>
+		<property name="myName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`parentdocument_name`" length="50"/>
+		</property>
+		<property name="mySpecificInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`myspecificinfo`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9a7ab19af
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,58 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.naturalId.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/naturalid</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 type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<natural-id mutable="false">
+			<property name="firstName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</property>
+			<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</property>
+			<many-to-one name="family" entity-name="Family" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_family" insert="true" update="true" not-null="true">
+				<column not-null="true" unique="false" name="`family_family_id`"/>
+			</many-to-one>
+		</natural-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="age" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`age`"/>
+		</property>
+		<property name="callName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`callname`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.naturalId.impl.FamilyImpl" entity-name="Family" abstract="false" lazy="false" discriminator-value="Family" table="`family`">
+		<meta attribute="eclassName">Family</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/naturalid</meta>
+		<id name="id" type="int" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="familydtype" length="255" not-null="true"/>
+		</discriminator>
+		<natural-id mutable="false">
+			<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`name`"/>
+			</property>
+		</natural-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="age" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`age`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6cc97e462
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,52 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.naturalId.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/naturalid</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>
+		<natural-id mutable="false">
+			<property name="firstName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</property>
+			<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</property>
+			<many-to-one name="family" entity-name="Family" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_family" insert="true" update="true" not-null="true">
+				<column not-null="true" unique="false" name="`family_family_id`"/>
+			</many-to-one>
+		</natural-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="age" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`age`"/>
+		</property>
+		<property name="callName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`callname`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.naturalId.impl.FamilyImpl" entity-name="Family" abstract="false" lazy="false" table="`family`">
+		<meta attribute="eclassName">Family</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/naturalid</meta>
+		<id name="id" type="int" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<natural-id mutable="false">
+			<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`name`"/>
+			</property>
+		</natural-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="age" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`age`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6cc97e462
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,52 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.naturalId.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/naturalid</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>
+		<natural-id mutable="false">
+			<property name="firstName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</property>
+			<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</property>
+			<many-to-one name="family" entity-name="Family" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_family" insert="true" update="true" not-null="true">
+				<column not-null="true" unique="false" name="`family_family_id`"/>
+			</many-to-one>
+		</natural-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="age" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`age`"/>
+		</property>
+		<property name="callName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`callname`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.naturalId.impl.FamilyImpl" entity-name="Family" abstract="false" lazy="false" table="`family`">
+		<meta attribute="eclassName">Family</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/naturalid</meta>
+		<id name="id" type="int" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<natural-id mutable="false">
+			<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`name`"/>
+			</property>
+		</natural-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="age" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`age`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6936c9df1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,36 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" discriminator-value="Employee" table="`employee`">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/otopk</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="foreign">
+				<param name="property">employeeInfo</param>
+			</generator>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="employeedtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="employeeInfo" entity-name="EmployeeInfo" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="false" foreign-key="employee_employeeinfo" insert="true" update="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl.EmployeeInfoImpl" entity-name="EmployeeInfo" abstract="false" lazy="false" discriminator-value="EmployeeInfo" table="`employeeinfo`">
+		<meta attribute="eclassName">EmployeeInfo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/otopk</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="employeeinfodtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..034c1449e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,30 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" table="`employee`">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/otopk</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="foreign">
+				<param name="property">employeeInfo</param>
+			</generator>
+		</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="employeeInfo" entity-name="EmployeeInfo" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="false" foreign-key="employee_employeeinfo" insert="true" update="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl.EmployeeInfoImpl" entity-name="EmployeeInfo" abstract="false" lazy="false" table="`employeeinfo`">
+		<meta attribute="eclassName">EmployeeInfo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/otopk</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<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>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..034c1449e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,30 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" table="`employee`">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/otopk</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="foreign">
+				<param name="property">employeeInfo</param>
+			</generator>
+		</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="employeeInfo" entity-name="EmployeeInfo" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="false" foreign-key="employee_employeeinfo" insert="true" update="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl.EmployeeInfoImpl" entity-name="EmployeeInfo" abstract="false" lazy="false" table="`employeeinfo`">
+		<meta attribute="eclassName">EmployeeInfo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/otopk</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<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>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..3fdd54abb
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,84 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</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 type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" extends="Person" discriminator-value="Employee">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<join table="`secondary_table`">
+			<key/>
+			<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+				<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="`other_name`"/>
+				</property>
+				<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+					<column not-null="false" unique="false" name="`other_street`"/>
+				</property>
+				<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+					<column not-null="false" unique="false" name="`other_city`"/>
+				</property>
+				<many-to-one name="country" entity-name="Country" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="address_country" insert="true" update="true" not-null="false">
+					<column not-null="false" unique="false" name="`addr_country`"/>
+				</many-to-one>
+			</component>
+			<property name="employeeNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`emp_num`"/>
+			</property>
+		</join>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.NonEmployeeImpl" entity-name="NonEmployee" abstract="false" lazy="false" extends="Person" discriminator-value="NonEmployee">
+		<meta attribute="eclassName">NonEmployee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+			<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="`address_name`"/>
+			</property>
+			<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`address_street`"/>
+			</property>
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`address_city`"/>
+			</property>
+			<many-to-one name="country" entity-name="Country" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="address_country" insert="true" update="true" not-null="false">
+				<column not-null="false" unique="false" name="`country_country_e_id`"/>
+			</many-to-one>
+		</component>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.CountryImpl" entity-name="Country" abstract="false" lazy="false" discriminator-value="Country" table="`country`">
+		<meta attribute="eclassName">Country</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</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 type="string">
+			<column name="dtype" index="countrydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c4a381845
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,81 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</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 type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" extends="Person" discriminator-value="Employee">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<join table="`secondary_table`">
+			<key/>
+			<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+				<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="`other_name`"/>
+				</property>
+				<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+					<column not-null="false" unique="false" name="`other_street`"/>
+				</property>
+				<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+					<column not-null="false" unique="false" name="`other_city`"/>
+				</property>
+				<many-to-one name="country" entity-name="Country" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="address_country" insert="true" update="true" not-null="false">
+					<column not-null="false" unique="false" name="`addr_country`"/>
+				</many-to-one>
+			</component>
+			<property name="employeeNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`emp_num`"/>
+			</property>
+		</join>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.NonEmployeeImpl" entity-name="NonEmployee" abstract="false" lazy="false" extends="Person" discriminator-value="NonEmployee">
+		<meta attribute="eclassName">NonEmployee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+			<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="`address_name`"/>
+			</property>
+			<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`address_street`"/>
+			</property>
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`address_city`"/>
+			</property>
+			<many-to-one name="country" entity-name="Country" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="address_country" insert="true" update="true" not-null="false">
+				<column not-null="false" unique="false" name="`country_country_e_id`"/>
+			</many-to-one>
+		</component>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.CountryImpl" entity-name="Country" abstract="false" lazy="false" table="`country`">
+		<meta attribute="eclassName">Country</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c4a381845
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,81 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</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 type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" extends="Person" discriminator-value="Employee">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<join table="`secondary_table`">
+			<key/>
+			<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+				<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="`other_name`"/>
+				</property>
+				<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+					<column not-null="false" unique="false" name="`other_street`"/>
+				</property>
+				<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+					<column not-null="false" unique="false" name="`other_city`"/>
+				</property>
+				<many-to-one name="country" entity-name="Country" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="address_country" insert="true" update="true" not-null="false">
+					<column not-null="false" unique="false" name="`addr_country`"/>
+				</many-to-one>
+			</component>
+			<property name="employeeNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`emp_num`"/>
+			</property>
+		</join>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.NonEmployeeImpl" entity-name="NonEmployee" abstract="false" lazy="false" extends="Person" discriminator-value="NonEmployee">
+		<meta attribute="eclassName">NonEmployee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+			<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="`address_name`"/>
+			</property>
+			<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`address_street`"/>
+			</property>
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`address_city`"/>
+			</property>
+			<many-to-one name="country" entity-name="Country" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="address_country" insert="true" update="true" not-null="false">
+				<column not-null="false" unique="false" name="`country_country_e_id`"/>
+			</many-to-one>
+		</component>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.CountryImpl" entity-name="Country" abstract="false" lazy="false" table="`country`">
+		<meta attribute="eclassName">Country</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d8d35b3d3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,35 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`">
+		<meta attribute="eclassName">Body</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta>
+		<id name="theID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`theid`"/>
+			<generator class="foreign">
+				<param name="property">head</param>
+			</generator>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bodydtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="head" entity-name="Head" cascade="all" not-null="true" lazy="false" foreign-key="body_head" insert="true" update="true" unique="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" discriminator-value="Head" table="`head`">
+		<meta attribute="eclassName">Head</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta>
+		<id name="myID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="headdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..751c24f38
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,29 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" table="`body`">
+		<meta attribute="eclassName">Body</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta>
+		<id name="theID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`theid`"/>
+			<generator class="foreign">
+				<param name="property">head</param>
+			</generator>
+		</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="head" entity-name="Head" cascade="all" not-null="true" lazy="false" foreign-key="body_head" insert="true" update="true" unique="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" table="`head`">
+		<meta attribute="eclassName">Head</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta>
+		<id name="myID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..751c24f38
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,29 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" table="`body`">
+		<meta attribute="eclassName">Body</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta>
+		<id name="theID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`theid`"/>
+			<generator class="foreign">
+				<param name="property">head</param>
+			</generator>
+		</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="head" entity-name="Head" cascade="all" not-null="true" lazy="false" foreign-key="body_head" insert="true" update="true" unique="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" table="`head`">
+		<meta attribute="eclassName">Head</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta>
+		<id name="myID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`myid`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ecc00b32a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,37 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`PERSON`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/secondarytablehibernate</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`ID`"/>
+		</id>
+		<discriminator type="string">
+			<column name="DTYPE" index="PERSONDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<join table="`PERSON_ADDRESS`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="address" lazy="false" insert="true" update="true" not-null="true" unique="false" type="text">
+				<column not-null="true" unique="false" name="`ADDRESS`"/>
+			</property>
+		</join>
+		<join table="`PERSON_PHOTO`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
+				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
+			</property>
+		</join>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2de4bd693
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,34 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`PERSON`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/secondarytablehibernate</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`ID`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<join table="`PERSON_ADDRESS`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="address" lazy="false" insert="true" update="true" not-null="true" unique="false" type="text">
+				<column not-null="true" unique="false" name="`ADDRESS`"/>
+			</property>
+		</join>
+		<join table="`PERSON_PHOTO`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
+				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
+			</property>
+		</join>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2de4bd693
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,34 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`PERSON`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/secondarytablehibernate</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`ID`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<join table="`PERSON_ADDRESS`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="address" lazy="false" insert="true" update="true" not-null="true" unique="false" type="text">
+				<column not-null="true" unique="false" name="`ADDRESS`"/>
+			</property>
+		</join>
+		<join table="`PERSON_PHOTO`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
+				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
+			</property>
+		</join>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xjoin_hibernate.hbm.xml
new file mode 100755
index 000000000..7a542ac8e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xjoin_hibernate.hbm.xml
@@ -0,0 +1,34 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`PERSON`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/secondarytablehibernate</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`ID`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<join table="`PERSON_ADDRESS`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+				<column not-null="false" unique="false" name="`ADDRESS`"/>
+			</property>
+		</join>
+		<join table="`PERSON_PHOTO`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
+				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
+			</property>
+		</join>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xsingle_hibernate.hbm.xml
new file mode 100755
index 000000000..63ebe7c4e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xsingle_hibernate.hbm.xml
@@ -0,0 +1,37 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`PERSON`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/secondarytablehibernate</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`ID`"/>
+		</id>
+		<discriminator type="string">
+			<column name="DTYPE" index="PERSONDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<join table="`PERSON_ADDRESS`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+				<column not-null="false" unique="false" name="`ADDRESS`"/>
+			</property>
+		</join>
+		<join table="`PERSON_PHOTO`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
+				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
+			</property>
+		</join>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..542a8de78
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,77 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="testSet.ContainedItem" abstract="false" lazy="false" discriminator-value="testSet.ContainedItem" table="`TESTSET_CONTAINEDITEM`">
+		<meta attribute="eclassName">ContainedItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</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 type="string">
+			<column name="DTYPE" index="TESTSET_CONTAINEDITEMDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="testSet.Item" abstract="false" lazy="false" discriminator-value="testSet.Item" table="`TESTSET_ITEM`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</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 type="string">
+			<column name="DTYPE" index="TESTSET_ITEMDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<many-to-one name="itemList" entity-name="testSet.ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTSET_ITEM_ITEMLIST" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ITEM_ITEMLIST_E_ID`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="testSet.ItemList" abstract="false" lazy="false" discriminator-value="testSet.ItemList" table="`TESTSET_ITEMLIST`">
+		<meta attribute="eclassName">ItemList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</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 type="string">
+			<column name="DTYPE" index="TESTSET_ITEMLISTDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM">
+				<column name="`ITEMLIST_CONTAINEDITEM_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.ContainedItem"/>
+		</bag>
+		<bag name="item" order-by="`NAME` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`ITEM_ITEMLIST_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.Item"/>
+		</bag>
+		<bag name="joinedItem" order-by="`NAME` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="TESTSET_ITEMLIST_JOINEDITEM">
+				<column name="`ITEMLIST_JOINEDITEM_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.Item"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..dd3c2ac71
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,68 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="testSet.ContainedItem" abstract="false" lazy="false" table="`TESTSET_CONTAINEDITEM`">
+		<meta attribute="eclassName">ContainedItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="testSet.Item" abstract="false" lazy="false" table="`TESTSET_ITEM`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<many-to-one name="itemList" entity-name="testSet.ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTSET_ITEM_ITEMLIST" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ITEM_ITEMLIST_E_ID`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="testSet.ItemList" abstract="false" lazy="false" table="`TESTSET_ITEMLIST`">
+		<meta attribute="eclassName">ItemList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM">
+				<column name="`ITEMLIST_CONTAINEDITEM_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.ContainedItem"/>
+		</bag>
+		<bag name="item" order-by="`NAME` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`ITEM_ITEMLIST_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.Item"/>
+		</bag>
+		<bag name="joinedItem" order-by="`NAME` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="TESTSET_ITEMLIST_JOINEDITEM">
+				<column name="`ITEMLIST_JOINEDITEM_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.Item"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..dd3c2ac71
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,68 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="testSet.ContainedItem" abstract="false" lazy="false" table="`TESTSET_CONTAINEDITEM`">
+		<meta attribute="eclassName">ContainedItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="testSet.Item" abstract="false" lazy="false" table="`TESTSET_ITEM`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<many-to-one name="itemList" entity-name="testSet.ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTSET_ITEM_ITEMLIST" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ITEM_ITEMLIST_E_ID`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="testSet.ItemList" abstract="false" lazy="false" table="`TESTSET_ITEMLIST`">
+		<meta attribute="eclassName">ItemList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM">
+				<column name="`ITEMLIST_CONTAINEDITEM_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.ContainedItem"/>
+		</bag>
+		<bag name="item" order-by="`NAME` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`ITEM_ITEMLIST_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.Item"/>
+		</bag>
+		<bag name="joinedItem" order-by="`NAME` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="TESTSET_ITEMLIST_JOINEDITEM">
+				<column name="`ITEMLIST_JOINEDITEM_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="testSet.Item"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0cf055e9b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,55 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.MyItemImpl" entity-name="MyItem" abstract="false" lazy="false" discriminator-value="MyItem" table="`myitem`">
+		<meta attribute="eclassName">MyItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/nmset</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 type="string">
+			<column name="dtype" index="myitemdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="yourItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`myitem_youritem`">
+			<key update="true">
+				<column name="`myitem_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="YourItem" unique="false" foreign-key="myitem_youritem">
+				<column name="`youritem_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.YourItemImpl" entity-name="YourItem" abstract="false" lazy="false" discriminator-value="YourItem" table="`youritem`">
+		<meta attribute="eclassName">YourItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/nmset</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 type="string">
+			<column name="dtype" index="youritemdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`myitem_youritem`">
+			<key update="true">
+				<column name="`youritem_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="MyItem" unique="false" foreign-key="youritem_myitem">
+				<column name="`myitem_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7988fd35b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,49 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.MyItemImpl" entity-name="MyItem" abstract="false" lazy="false" table="`myitem`">
+		<meta attribute="eclassName">MyItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/nmset</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="yourItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`myitem_youritem`">
+			<key update="true">
+				<column name="`myitem_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="YourItem" unique="false" foreign-key="myitem_youritem">
+				<column name="`youritem_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.YourItemImpl" entity-name="YourItem" abstract="false" lazy="false" table="`youritem`">
+		<meta attribute="eclassName">YourItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/nmset</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`myitem_youritem`">
+			<key update="true">
+				<column name="`youritem_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="MyItem" unique="false" foreign-key="youritem_myitem">
+				<column name="`myitem_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7988fd35b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,49 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.MyItemImpl" entity-name="MyItem" abstract="false" lazy="false" table="`myitem`">
+		<meta attribute="eclassName">MyItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/nmset</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="yourItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`myitem_youritem`">
+			<key update="true">
+				<column name="`myitem_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="YourItem" unique="false" foreign-key="myitem_youritem">
+				<column name="`youritem_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.YourItemImpl" entity-name="YourItem" abstract="false" lazy="false" table="`youritem`">
+		<meta attribute="eclassName">YourItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/nmset</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`myitem_youritem`">
+			<key update="true">
+				<column name="`youritem_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="MyItem" unique="false" foreign-key="youritem_myitem">
+				<column name="`myitem_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f28794516
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,77 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="ContainedItem" abstract="false" lazy="false" discriminator-value="ContainedItem" table="`containeditem`">
+		<meta attribute="eclassName">ContainedItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</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 type="string">
+			<column name="dtype" index="containeditemdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</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 type="string">
+			<column name="dtype" index="itemdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="itemList" entity-name="ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="item_itemlist" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`item_itemlist_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="ItemList" abstract="false" lazy="false" discriminator-value="ItemList" table="`itemlist`">
+		<meta attribute="eclassName">ItemList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</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 type="string">
+			<column name="dtype" index="itemlistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="itemlist_containeditem">
+				<column name="`itemlist_containeditem_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="ContainedItem"/>
+		</bag>
+		<bag name="item" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`item_itemlist_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Item"/>
+		</bag>
+		<bag name="joinedItem" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="itemlist_joineditem">
+				<column name="`itemlist_joineditem_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Item"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e128fa42b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,68 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="ContainedItem" abstract="false" lazy="false" table="`containeditem`">
+		<meta attribute="eclassName">ContainedItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="itemList" entity-name="ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="item_itemlist" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`item_itemlist_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="ItemList" abstract="false" lazy="false" table="`itemlist`">
+		<meta attribute="eclassName">ItemList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="itemlist_containeditem">
+				<column name="`itemlist_containeditem_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="ContainedItem"/>
+		</bag>
+		<bag name="item" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`item_itemlist_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Item"/>
+		</bag>
+		<bag name="joinedItem" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="itemlist_joineditem">
+				<column name="`itemlist_joineditem_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Item"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c114afa60
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,68 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="ContainedItem" abstract="false" lazy="false" table="`containeditem`">
+		<meta attribute="eclassName">ContainedItem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="itemList" entity-name="ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="item_itemlist" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`item_itemlist_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="ItemList" abstract="false" lazy="false" table="`itemlist`">
+		<meta attribute="eclassName">ItemList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="itemlist_containeditem">
+				<column name="`itemlist_containeditem_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="ContainedItem"/>
+		</bag>
+		<bag name="item" order-by="`name` desc" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`item_itemlist_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Item"/>
+		</bag>
+		<bag name="joinedItem" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="itemlist_joineditem">
+				<column name="`itemlist_joineditem_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Item"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0462fcdfe
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,76 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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 type="string">
+			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.ArmImpl" entity-name="Arm" abstract="false" lazy="false" discriminator-value="Arm" table="`arm`">
+		<meta attribute="eclassName">Arm</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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 type="string">
+			<column name="dtype" index="armdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`length`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" discriminator-value="Head" table="`head`">
+		<meta attribute="eclassName">Head</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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 type="string">
+			<column name="dtype" index="headdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`haircolor`"/>
+		</property>
+		<one-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="head" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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 type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="address" entity-name="Address" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<many-to-one name="head" entity-name="Head" cascade="all" not-null="false" lazy="false" insert="true" update="true"/>
+		<many-to-one name="leftArm" entity-name="Arm" not-null="false" lazy="false" foreign-key="person_leftarm" insert="true" update="true"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..3658199e7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,64 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.ArmImpl" entity-name="Arm" abstract="false" lazy="false" table="`arm`">
+		<meta attribute="eclassName">Arm</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`length`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" table="`head`">
+		<meta attribute="eclassName">Head</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`haircolor`"/>
+		</property>
+		<one-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="head" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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="address" entity-name="Address" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<many-to-one name="head" entity-name="Head" cascade="all" not-null="false" lazy="false" insert="true" update="true"/>
+		<many-to-one name="leftArm" entity-name="Arm" not-null="false" lazy="false" foreign-key="person_leftarm" insert="true" update="true"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..3658199e7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,64 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.ArmImpl" entity-name="Arm" abstract="false" lazy="false" table="`arm`">
+		<meta attribute="eclassName">Arm</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`length`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" table="`head`">
+		<meta attribute="eclassName">Head</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`haircolor`"/>
+		</property>
+		<one-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="head" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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="address" entity-name="Address" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<many-to-one name="head" entity-name="Head" cascade="all" not-null="false" lazy="false" insert="true" update="true"/>
+		<many-to-one name="leftArm" entity-name="Arm" not-null="false" lazy="false" foreign-key="person_leftarm" insert="true" update="true"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xjoin_hibernate.hbm.xml
new file mode 100755
index 000000000..cc9166ceb
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xjoin_hibernate.hbm.xml
@@ -0,0 +1,66 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.ArmImpl" entity-name="Arm" abstract="false" lazy="false" table="`arm`">
+		<meta attribute="eclassName">Arm</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`length`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" table="`head`">
+		<meta attribute="eclassName">Head</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`haircolor`"/>
+		</property>
+		<one-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="head" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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="address" entity-name="Address" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<many-to-one name="head" entity-name="Head" cascade="all" not-null="false" lazy="false" insert="true" update="true"/>
+		<many-to-one name="leftArm" entity-name="Arm" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_leftarm" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`arm_leftarm_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xsingle_hibernate.hbm.xml
new file mode 100755
index 000000000..8b1c4f3af
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xsingle_hibernate.hbm.xml
@@ -0,0 +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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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 type="string">
+			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.ArmImpl" entity-name="Arm" abstract="false" lazy="false" discriminator-value="Arm" table="`arm`">
+		<meta attribute="eclassName">Arm</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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 type="string">
+			<column name="dtype" index="armdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`length`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" discriminator-value="Head" table="`head`">
+		<meta attribute="eclassName">Head</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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 type="string">
+			<column name="dtype" index="headdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`haircolor`"/>
+		</property>
+		<one-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="head" constrained="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</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 type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="address" entity-name="Address" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<many-to-one name="head" entity-name="Head" cascade="all" not-null="false" lazy="false" insert="true" update="true"/>
+		<many-to-one name="leftArm" entity-name="Arm" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_leftarm" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`arm_leftarm_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8c737e6d8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,18 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.transent.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`">
+		<meta attribute="eclassName">Body</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/transent</meta>
+		<id name="theID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`theid`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bodydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7cc2c8e07
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,15 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.transent.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" table="`body`">
+		<meta attribute="eclassName">Body</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/transent</meta>
+		<id name="theID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`theid`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7cc2c8e07
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,15 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.transent.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" table="`body`">
+		<meta attribute="eclassName">Body</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/transent</meta>
+		<id name="theID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`theid`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_xjoin_hibernate.hbm.xml
new file mode 100755
index 000000000..7cc2c8e07
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_xjoin_hibernate.hbm.xml
@@ -0,0 +1,15 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.transent.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" table="`body`">
+		<meta attribute="eclassName">Body</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/transent</meta>
+		<id name="theID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`theid`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_xsingle_hibernate.hbm.xml
new file mode 100755
index 000000000..8c737e6d8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_xsingle_hibernate.hbm.xml
@@ -0,0 +1,18 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.transent.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`">
+		<meta attribute="eclassName">Body</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/transent</meta>
+		<id name="theID" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`theid`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bodydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..cf3f95caa
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,45 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`myitemtable`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints</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 type="string">
+			<column name="dtype" index="MYITEMTABLEdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mystr`" unique-key="c0"/>
+		</property>
+		<many-to-one name="project" entity-name="Project" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="item_project" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`myproject`" unique-key="c0"/>
+		</many-to-one>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`myint`" unique-key="c0"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ProjectImpl" entity-name="Project" abstract="false" lazy="false" discriminator-value="Project" table="`project`">
+		<meta attribute="eclassName">Project</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints</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 type="string">
+			<column name="dtype" index="projectdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..953ef13ed
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,39 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`myitemtable`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mystr`" unique-key="c0"/>
+		</property>
+		<many-to-one name="project" entity-name="Project" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="item_project" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`myproject`" unique-key="c0"/>
+		</many-to-one>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`myint`" unique-key="c0"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ProjectImpl" entity-name="Project" abstract="false" lazy="false" table="`project`">
+		<meta attribute="eclassName">Project</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..953ef13ed
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,39 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`myitemtable`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mystr`" unique-key="c0"/>
+		</property>
+		<many-to-one name="project" entity-name="Project" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="item_project" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`myproject`" unique-key="c0"/>
+		</many-to-one>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`myint`" unique-key="c0"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ProjectImpl" entity-name="Project" abstract="false" lazy="false" table="`project`">
+		<meta attribute="eclassName">Project</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..456e8bb59
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,51 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" batch-size="9" discriminator-value="Parent" table="`parent`">
+		<meta attribute="eclassName">Parent</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</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 type="string" force="true">
+			<column name="dtype" index="parentdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="children" batch-size="11" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="parent_children">
+				<column name="`parent_children_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_children_idx`"/>
+			<one-to-many entity-name="Child"/>
+		</list>
+		<property name="totalPeople" lazy="false" not-null="false" type="int">
+			<formula>(select count(*) from parent)</formula>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Parent" discriminator-value="Child">
+		<meta attribute="eclassName">Child</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</meta>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ImmutableCityImpl" entity-name="ImmutableCity" abstract="false" lazy="false" mutable="false" table="`immutablecity`">
+		<meta attribute="eclassName">ImmutableCity</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</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>
+		<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="parents" mutable="false" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="immutablecity_parents">
+				<column name="`immutablecity_parents_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`immutablecity_parents_idx`"/>
+			<one-to-many entity-name="Parent"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8d0a1a328
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,51 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" batch-size="9" table="`parent`">
+		<meta attribute="eclassName">Parent</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</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="children" batch-size="11" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="parent_children">
+				<column name="`parent_children_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_children_idx`"/>
+			<one-to-many entity-name="Child"/>
+		</list>
+		<property name="totalPeople" lazy="false" not-null="false" type="int">
+			<formula>(select count(*) from parent)</formula>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Parent" table="`child`">
+		<meta attribute="eclassName">Child</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</meta>
+		<key>
+			<column name="`parent_e_id`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ImmutableCityImpl" entity-name="ImmutableCity" abstract="false" lazy="false" mutable="false" table="`immutablecity`">
+		<meta attribute="eclassName">ImmutableCity</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</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>
+		<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="parents" mutable="false" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="immutablecity_parents">
+				<column name="`immutablecity_parents_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`immutablecity_parents_idx`"/>
+			<one-to-many entity-name="Parent"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8d0a1a328
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,51 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" batch-size="9" table="`parent`">
+		<meta attribute="eclassName">Parent</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</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="children" batch-size="11" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="parent_children">
+				<column name="`parent_children_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`parent_children_idx`"/>
+			<one-to-many entity-name="Child"/>
+		</list>
+		<property name="totalPeople" lazy="false" not-null="false" type="int">
+			<formula>(select count(*) from parent)</formula>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Parent" table="`child`">
+		<meta attribute="eclassName">Child</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</meta>
+		<key>
+			<column name="`parent_e_id`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ImmutableCityImpl" entity-name="ImmutableCity" abstract="false" lazy="false" mutable="false" table="`immutablecity`">
+		<meta attribute="eclassName">ImmutableCity</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</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>
+		<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="parents" mutable="false" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="immutablecity_parents">
+				<column name="`immutablecity_parents_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`immutablecity_parents_idx`"/>
+			<one-to-many entity-name="Parent"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.detach/DetachEListAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.detach/DetachEListAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..549e51dee
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.detach/DetachEListAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,57 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachelist.impl.ContactsImpl" entity-name="Contacts" abstract="false" lazy="false" discriminator-value="Contacts" table="`contacts`">
+		<meta attribute="eclassName">Contacts</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/detach/detachelist</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 type="string">
+			<column name="dtype" index="contactsdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="persons" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contacts_persons">
+				<column name="`contacts_persons_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contacts_persons_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+		<list name="containedPersons" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="contacts_containedpersons">
+				<column name="`contacts_containedpersons_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contacts_containedpersons_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachelist.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/detach/detachelist</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 type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="children" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="person_children">
+				<column name="`person_children_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_children_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.detach/DetachEListAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.detach/DetachEListAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7f8a10e99
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.detach/DetachEListAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,51 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachelist.impl.ContactsImpl" entity-name="Contacts" abstract="false" lazy="false" table="`contacts`">
+		<meta attribute="eclassName">Contacts</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/detach/detachelist</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="persons" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contacts_persons">
+				<column name="`contacts_persons_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contacts_persons_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+		<list name="containedPersons" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="contacts_containedpersons">
+				<column name="`contacts_containedpersons_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contacts_containedpersons_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachelist.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/detach/detachelist</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="children" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="person_children">
+				<column name="`person_children_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_children_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.detach/DetachEListAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.detach/DetachEListAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7f8a10e99
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.detach/DetachEListAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,51 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachelist.impl.ContactsImpl" entity-name="Contacts" abstract="false" lazy="false" table="`contacts`">
+		<meta attribute="eclassName">Contacts</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/detach/detachelist</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="persons" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contacts_persons">
+				<column name="`contacts_persons_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contacts_persons_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+		<list name="containedPersons" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="contacts_containedpersons">
+				<column name="`contacts_containedpersons_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contacts_containedpersons_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.detach.detachelist.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/detach/detachelist</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="children" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="person_children">
+				<column name="`person_children_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_children_idx`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.elist/FeatureMapAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.elist/FeatureMapAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..53a27d920
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.elist/FeatureMapAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,139 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="featuremap.ProductClassificationObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+		<param name="edatatype">ProductClassificationObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.PriceByQuantityTypeImpl" entity-name="PriceByQuantityType" abstract="false" lazy="false" discriminator-value="PriceByQuantityType" table="`pricebyquantitytype`">
+		<meta attribute="eclassName">PriceByQuantityType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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 type="string">
+			<column name="dtype" index="pricebyquantitytypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`quantity`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`">
+		<meta attribute="eclassName">ProductType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="producttypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="group" table="`producttype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`producttype_group_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_group_idx`"/>
+			<one-to-many entity-name="ProductType_group"/>
+		</list>
+		<property name="productClassification" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`productclassification`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.elist.featuremap.ProductClassification</param>
+				<param name="eclassifier">ProductClassification</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+			</type>
+		</property>
+		<list name="group1" table="`producttype_group1`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`producttype_group1_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_group1_idx`"/>
+			<one-to-many entity-name="ProductType_group1"/>
+		</list>
+	</class>
+	<class entity-name="ProductType_group" lazy="false" table="`producttype_group`">
+		<meta attribute="featureMap">ProductType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`group_description`"/>
+		</property>
+		<many-to-one name="translatedDescription" entity-name="TranslatedDescriptionType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_translateddescription" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_translateddescriptiontype_translateddescription_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="ProductType_group1" lazy="false" table="`producttype_group1`">
+		<meta attribute="featureMap">ProductType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="priceByQuantity" entity-name="PriceByQuantityType" lazy="false" cascade="all" foreign-key="producttype_pricebyquantity" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group1_pricebyquantitytype_pricebyquantity_e_id`"/>
+		</many-to-one>
+		<many-to-one name="priceFromSupplier" entity-name="SupplierPriceType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_pricefromsupplier" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group1_supplierpricetype_pricefromsupplier_e_id`"/>
+		</many-to-one>
+		<property name="simplePrice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`group1_simpleprice`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.SupplierPriceTypeImpl" entity-name="SupplierPriceType" abstract="false" lazy="false" discriminator-value="SupplierPriceType" table="`supplierpricetype`">
+		<meta attribute="eclassName">SupplierPriceType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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 type="string">
+			<column name="dtype" index="supplierpricetypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.TranslatedDescriptionTypeImpl" entity-name="TranslatedDescriptionType" abstract="false" lazy="false" discriminator-value="TranslatedDescriptionType" table="`translateddescriptiontype`">
+		<meta attribute="eclassName">TranslatedDescriptionType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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 type="string">
+			<column name="dtype" index="translateddescriptiontypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="language" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`language`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.elist/FeatureMapAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.elist/FeatureMapAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0060516f4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.elist/FeatureMapAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,127 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="featuremap.ProductClassificationObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+		<param name="edatatype">ProductClassificationObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.PriceByQuantityTypeImpl" entity-name="PriceByQuantityType" abstract="false" lazy="false" table="`pricebyquantitytype`">
+		<meta attribute="eclassName">PriceByQuantityType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`quantity`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" table="`producttype`">
+		<meta attribute="eclassName">ProductType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="group" table="`producttype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`producttype_group_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_group_idx`"/>
+			<one-to-many entity-name="ProductType_group"/>
+		</list>
+		<property name="productClassification" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`productclassification`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.elist.featuremap.ProductClassification</param>
+				<param name="eclassifier">ProductClassification</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+			</type>
+		</property>
+		<list name="group1" table="`producttype_group1`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`producttype_group1_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_group1_idx`"/>
+			<one-to-many entity-name="ProductType_group1"/>
+		</list>
+	</class>
+	<class entity-name="ProductType_group" lazy="false" table="`producttype_group`">
+		<meta attribute="featureMap">ProductType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`group_description`"/>
+		</property>
+		<many-to-one name="translatedDescription" entity-name="TranslatedDescriptionType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_translateddescription" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_translateddescriptiontype_translateddescription_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="ProductType_group1" lazy="false" table="`producttype_group1`">
+		<meta attribute="featureMap">ProductType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="priceByQuantity" entity-name="PriceByQuantityType" lazy="false" cascade="all" foreign-key="producttype_pricebyquantity" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group1_pricebyquantitytype_pricebyquantity_e_id`"/>
+		</many-to-one>
+		<many-to-one name="priceFromSupplier" entity-name="SupplierPriceType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_pricefromsupplier" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group1_supplierpricetype_pricefromsupplier_e_id`"/>
+		</many-to-one>
+		<property name="simplePrice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`group1_simpleprice`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.SupplierPriceTypeImpl" entity-name="SupplierPriceType" abstract="false" lazy="false" table="`supplierpricetype`">
+		<meta attribute="eclassName">SupplierPriceType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.TranslatedDescriptionTypeImpl" entity-name="TranslatedDescriptionType" abstract="false" lazy="false" table="`translateddescriptiontype`">
+		<meta attribute="eclassName">TranslatedDescriptionType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="language" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`language`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.elist/FeatureMapAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.elist/FeatureMapAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0060516f4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.elist/FeatureMapAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,127 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="featuremap.ProductClassificationObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+		<param name="edatatype">ProductClassificationObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.PriceByQuantityTypeImpl" entity-name="PriceByQuantityType" abstract="false" lazy="false" table="`pricebyquantitytype`">
+		<meta attribute="eclassName">PriceByQuantityType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`quantity`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" table="`producttype`">
+		<meta attribute="eclassName">ProductType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="group" table="`producttype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`producttype_group_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_group_idx`"/>
+			<one-to-many entity-name="ProductType_group"/>
+		</list>
+		<property name="productClassification" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`productclassification`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.elist.featuremap.ProductClassification</param>
+				<param name="eclassifier">ProductClassification</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param>
+			</type>
+		</property>
+		<list name="group1" table="`producttype_group1`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`producttype_group1_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_group1_idx`"/>
+			<one-to-many entity-name="ProductType_group1"/>
+		</list>
+	</class>
+	<class entity-name="ProductType_group" lazy="false" table="`producttype_group`">
+		<meta attribute="featureMap">ProductType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`group_description`"/>
+		</property>
+		<many-to-one name="translatedDescription" entity-name="TranslatedDescriptionType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_translateddescription" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_translateddescriptiontype_translateddescription_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="ProductType_group1" lazy="false" table="`producttype_group1`">
+		<meta attribute="featureMap">ProductType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="priceByQuantity" entity-name="PriceByQuantityType" lazy="false" cascade="all" foreign-key="producttype_pricebyquantity" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group1_pricebyquantitytype_pricebyquantity_e_id`"/>
+		</many-to-one>
+		<many-to-one name="priceFromSupplier" entity-name="SupplierPriceType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_pricefromsupplier" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group1_supplierpricetype_pricefromsupplier_e_id`"/>
+		</many-to-one>
+		<property name="simplePrice" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`group1_simpleprice`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.SupplierPriceTypeImpl" entity-name="SupplierPriceType" abstract="false" lazy="false" table="`supplierpricetype`">
+		<meta attribute="eclassName">SupplierPriceType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl.TranslatedDescriptionTypeImpl" entity-name="TranslatedDescriptionType" abstract="false" lazy="false" table="`translateddescriptiontype`">
+		<meta attribute="eclassName">TranslatedDescriptionType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</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="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="language" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`language`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..05aba12ee
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,159 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildNRImpl" entity-name="ContainedChildNR" abstract="false" lazy="false" discriminator-value="ContainedChildNR" table="`containedchildnr`">
+		<meta attribute="eclassName">ContainedChildNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</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 type="string">
+			<column name="dtype" index="containedchildnrdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildRImpl" entity-name="ContainedChildR" abstract="false" lazy="false" discriminator-value="ContainedChildR" table="`containedchildr`">
+		<meta attribute="eclassName">ContainedChildR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</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 type="string">
+			<column name="dtype" index="containedchildrdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.MainImpl" entity-name="Main" abstract="false" lazy="false" discriminator-value="Main" table="`main`">
+		<meta attribute="eclassName">Main</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</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 type="string">
+			<column name="dtype" index="maindtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="containedonewayrequired" entity-name="ContainedChildR" lazy="false" cascade="all" foreign-key="main_containedonewayrequired" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`containedchildr_containedonewayrequired_e_id`"/>
+		</many-to-one>
+		<many-to-one name="containedoneWaynotrequired" entity-name="ContainedChildNR" lazy="false" cascade="all" foreign-key="main_containedonewaynotrequired" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`containedchildnr_containedonewaynotrequired_e_id`"/>
+		</many-to-one>
+		<many-to-one name="notcontainedonewayrequired" entity-name="NotContainedChildR" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="main_notcontainedonewayrequired" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`notcontainedchildr_notcontainedonewayrequired_e_id`"/>
+		</many-to-one>
+		<many-to-one name="notcontainedonewaynotrequired" entity-name="NotContainedChildNR" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="main_notcontainedonewaynotrequired" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`notcontainedchildnr_notcontainedonewaynotrequired_e_id`"/>
+		</many-to-one>
+		<one-to-one name="notcontainedtwowaynotrequired" entity-name="NotContainedChildNRT" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main"/>
+		<one-to-one name="notcontainedtwowayrequirednr" entity-name="NotContainedChildRTNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main" constrained="true"/>
+		<one-to-one name="notcontainedtwowaynotrequirednr" entity-name="NotContainedChildNRTNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildNRImpl" entity-name="NotContainedChildNR" abstract="false" lazy="false" discriminator-value="NotContainedChildNR" table="`notcontainedchildnr`">
+		<meta attribute="eclassName">NotContainedChildNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</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 type="string">
+			<column name="dtype" index="notcontainedchildnrdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildNRTImpl" entity-name="NotContainedChildNRT" abstract="false" lazy="false" discriminator-value="NotContainedChildNRT" table="`notcontainedchildnrt`">
+		<meta attribute="eclassName">NotContainedChildNRT</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</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 type="string">
+			<column name="dtype" index="notcontainedchildnrtdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" not-null="true" lazy="false" insert="true" update="true" unique="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildNRTNRImpl" entity-name="NotContainedChildNRTNR" abstract="false" lazy="false" discriminator-value="NotContainedChildNRTNR" table="`notcontainedchildnrtnr`">
+		<meta attribute="eclassName">NotContainedChildNRTNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</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 type="string">
+			<column name="dtype" index="notcontainedchildnrtnrdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="false" insert="true" update="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildRImpl" entity-name="NotContainedChildR" abstract="false" lazy="false" discriminator-value="NotContainedChildR" table="`notcontainedchildr`">
+		<meta attribute="eclassName">NotContainedChildR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</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 type="string">
+			<column name="dtype" index="notcontainedchildrdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildRTNRImpl" entity-name="NotContainedChildRTNR" abstract="false" lazy="false" discriminator-value="NotContainedChildRTNR" table="`notcontainedchildrtnr`">
+		<meta attribute="eclassName">NotContainedChildRTNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</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 type="string">
+			<column name="dtype" index="notcontainedchildrtnrdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="false" insert="true" update="true"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..57967f607
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,135 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildNRImpl" entity-name="ContainedChildNR" abstract="false" lazy="false" table="`containedchildnr`">
+		<meta attribute="eclassName">ContainedChildNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildRImpl" entity-name="ContainedChildR" abstract="false" lazy="false" table="`containedchildr`">
+		<meta attribute="eclassName">ContainedChildR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.MainImpl" entity-name="Main" abstract="false" lazy="false" table="`main`">
+		<meta attribute="eclassName">Main</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="containedonewayrequired" entity-name="ContainedChildR" lazy="false" cascade="all" foreign-key="main_containedonewayrequired" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`containedchildr_containedonewayrequired_e_id`"/>
+		</many-to-one>
+		<many-to-one name="containedoneWaynotrequired" entity-name="ContainedChildNR" lazy="false" cascade="all" foreign-key="main_containedonewaynotrequired" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`containedchildnr_containedonewaynotrequired_e_id`"/>
+		</many-to-one>
+		<many-to-one name="notcontainedonewayrequired" entity-name="NotContainedChildR" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="main_notcontainedonewayrequired" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`notcontainedchildr_notcontainedonewayrequired_e_id`"/>
+		</many-to-one>
+		<many-to-one name="notcontainedonewaynotrequired" entity-name="NotContainedChildNR" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="main_notcontainedonewaynotrequired" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`notcontainedchildnr_notcontainedonewaynotrequired_e_id`"/>
+		</many-to-one>
+		<one-to-one name="notcontainedtwowaynotrequired" entity-name="NotContainedChildNRT" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main"/>
+		<one-to-one name="notcontainedtwowayrequirednr" entity-name="NotContainedChildRTNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main" constrained="true"/>
+		<one-to-one name="notcontainedtwowaynotrequirednr" entity-name="NotContainedChildNRTNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildNRImpl" entity-name="NotContainedChildNR" abstract="false" lazy="false" table="`notcontainedchildnr`">
+		<meta attribute="eclassName">NotContainedChildNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildNRTImpl" entity-name="NotContainedChildNRT" abstract="false" lazy="false" table="`notcontainedchildnrt`">
+		<meta attribute="eclassName">NotContainedChildNRT</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" not-null="true" lazy="false" insert="true" update="true" unique="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildNRTNRImpl" entity-name="NotContainedChildNRTNR" abstract="false" lazy="false" table="`notcontainedchildnrtnr`">
+		<meta attribute="eclassName">NotContainedChildNRTNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="false" insert="true" update="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildRImpl" entity-name="NotContainedChildR" abstract="false" lazy="false" table="`notcontainedchildr`">
+		<meta attribute="eclassName">NotContainedChildR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildRTNRImpl" entity-name="NotContainedChildRTNR" abstract="false" lazy="false" table="`notcontainedchildrtnr`">
+		<meta attribute="eclassName">NotContainedChildRTNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="false" insert="true" update="true"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..57967f607
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,135 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildNRImpl" entity-name="ContainedChildNR" abstract="false" lazy="false" table="`containedchildnr`">
+		<meta attribute="eclassName">ContainedChildNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.ContainedChildRImpl" entity-name="ContainedChildR" abstract="false" lazy="false" table="`containedchildr`">
+		<meta attribute="eclassName">ContainedChildR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.MainImpl" entity-name="Main" abstract="false" lazy="false" table="`main`">
+		<meta attribute="eclassName">Main</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="containedonewayrequired" entity-name="ContainedChildR" lazy="false" cascade="all" foreign-key="main_containedonewayrequired" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`containedchildr_containedonewayrequired_e_id`"/>
+		</many-to-one>
+		<many-to-one name="containedoneWaynotrequired" entity-name="ContainedChildNR" lazy="false" cascade="all" foreign-key="main_containedonewaynotrequired" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`containedchildnr_containedonewaynotrequired_e_id`"/>
+		</many-to-one>
+		<many-to-one name="notcontainedonewayrequired" entity-name="NotContainedChildR" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="main_notcontainedonewayrequired" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`notcontainedchildr_notcontainedonewayrequired_e_id`"/>
+		</many-to-one>
+		<many-to-one name="notcontainedonewaynotrequired" entity-name="NotContainedChildNR" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="main_notcontainedonewaynotrequired" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`notcontainedchildnr_notcontainedonewaynotrequired_e_id`"/>
+		</many-to-one>
+		<one-to-one name="notcontainedtwowaynotrequired" entity-name="NotContainedChildNRT" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main"/>
+		<one-to-one name="notcontainedtwowayrequirednr" entity-name="NotContainedChildRTNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main" constrained="true"/>
+		<one-to-one name="notcontainedtwowaynotrequirednr" entity-name="NotContainedChildNRTNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildNRImpl" entity-name="NotContainedChildNR" abstract="false" lazy="false" table="`notcontainedchildnr`">
+		<meta attribute="eclassName">NotContainedChildNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildNRTImpl" entity-name="NotContainedChildNRT" abstract="false" lazy="false" table="`notcontainedchildnrt`">
+		<meta attribute="eclassName">NotContainedChildNRT</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" not-null="true" lazy="false" insert="true" update="true" unique="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildNRTNRImpl" entity-name="NotContainedChildNRTNR" abstract="false" lazy="false" table="`notcontainedchildnrtnr`">
+		<meta attribute="eclassName">NotContainedChildNRTNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="false" insert="true" update="true"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildRImpl" entity-name="NotContainedChildR" abstract="false" lazy="false" table="`notcontainedchildr`">
+		<meta attribute="eclassName">NotContainedChildR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildRTNRImpl" entity-name="NotContainedChildRTNR" abstract="false" lazy="false" table="`notcontainedchildrtnr`">
+		<meta attribute="eclassName">NotContainedChildRTNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1to1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="false" insert="true" update="true"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1tonAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1tonAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f814f1a85
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1tonAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.MainImpl" entity-name="Main" abstract="false" lazy="false" discriminator-value="Main" table="`main`">
+		<meta attribute="eclassName">Main</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</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 type="string">
+			<column name="dtype" index="maindtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="onecr" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="main_onecr">
+				<column name="`main_onecr_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_onecr_idx`"/>
+			<one-to-many entity-name="OneCR"/>
+		</list>
+		<list name="onecn" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="main_onecn">
+				<column name="`main_onecn_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_onecn_idx`"/>
+			<one-to-many entity-name="OneCN"/>
+		</list>
+		<list name="onenr" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="main_onenr">
+				<column name="`main_onenr_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_onenr_idx`"/>
+			<one-to-many entity-name="OneNR"/>
+		</list>
+		<list name="onenn" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="main_onenn">
+				<column name="`main_onenn_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_onenn_idx`"/>
+			<one-to-many entity-name="OneNN"/>
+		</list>
+		<list name="twocr" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="main_twocr">
+				<column name="`twocr_main_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_twocr_idx`"/>
+			<one-to-many entity-name="TwoCR"/>
+		</list>
+		<list name="twocn" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="main_twocn">
+				<column name="`twocn_main_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_twocn_idx`"/>
+			<one-to-many entity-name="TwoCN"/>
+		</list>
+		<list name="twonr" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`twonr_main_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_twonr_idx`"/>
+			<one-to-many entity-name="TwoNR"/>
+		</list>
+		<list name="twonn" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`twonn_main_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_twonn_idx`"/>
+			<one-to-many entity-name="TwoNN"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.OneCNImpl" entity-name="OneCN" abstract="false" lazy="false" discriminator-value="OneCN" table="`onecn`">
+		<meta attribute="eclassName">OneCN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</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 type="string">
+			<column name="dtype" index="onecndtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.OneCRImpl" entity-name="OneCR" abstract="false" lazy="false" discriminator-value="OneCR" table="`onecr`">
+		<meta attribute="eclassName">OneCR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</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 type="string">
+			<column name="dtype" index="onecrdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.OneNNImpl" entity-name="OneNN" abstract="false" lazy="false" discriminator-value="OneNN" table="`onenn`">
+		<meta attribute="eclassName">OneNN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</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 type="string">
+			<column name="dtype" index="onenndtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.OneNRImpl" entity-name="OneNR" abstract="false" lazy="false" discriminator-value="OneNR" table="`onenr`">
+		<meta attribute="eclassName">OneNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</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 type="string">
+			<column name="dtype" index="onenrdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.TwoCNImpl" entity-name="TwoCN" abstract="false" lazy="false" discriminator-value="TwoCN" table="`twocn`">
+		<meta attribute="eclassName">TwoCN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</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 type="string">
+			<column name="dtype" index="twocndtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="twocn_main" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`twocn_main_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.TwoCRImpl" entity-name="TwoCR" abstract="false" lazy="false" discriminator-value="TwoCR" table="`twocr`">
+		<meta attribute="eclassName">TwoCR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</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 type="string">
+			<column name="dtype" index="twocrdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="twocr_main" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`twocr_main_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.TwoNNImpl" entity-name="TwoNN" abstract="false" lazy="false" discriminator-value="TwoNN" table="`twonn`">
+		<meta attribute="eclassName">TwoNN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</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 type="string">
+			<column name="dtype" index="twonndtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="twonn_main" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`twonn_main_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.TwoNRImpl" entity-name="TwoNR" abstract="false" lazy="false" discriminator-value="TwoNR" table="`twonr`">
+		<meta attribute="eclassName">TwoNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</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 type="string">
+			<column name="dtype" index="twonrdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="twonr_main" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`twonr_main_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1tonAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1tonAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ab5b7efca
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1tonAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,199 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.MainImpl" entity-name="Main" abstract="false" lazy="false" table="`main`">
+		<meta attribute="eclassName">Main</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="onecr" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="main_onecr">
+				<column name="`main_onecr_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_onecr_idx`"/>
+			<one-to-many entity-name="OneCR"/>
+		</list>
+		<list name="onecn" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="main_onecn">
+				<column name="`main_onecn_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_onecn_idx`"/>
+			<one-to-many entity-name="OneCN"/>
+		</list>
+		<list name="onenr" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="main_onenr">
+				<column name="`main_onenr_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_onenr_idx`"/>
+			<one-to-many entity-name="OneNR"/>
+		</list>
+		<list name="onenn" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="main_onenn">
+				<column name="`main_onenn_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_onenn_idx`"/>
+			<one-to-many entity-name="OneNN"/>
+		</list>
+		<list name="twocr" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="main_twocr">
+				<column name="`twocr_main_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_twocr_idx`"/>
+			<one-to-many entity-name="TwoCR"/>
+		</list>
+		<list name="twocn" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="main_twocn">
+				<column name="`twocn_main_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_twocn_idx`"/>
+			<one-to-many entity-name="TwoCN"/>
+		</list>
+		<list name="twonr" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`twonr_main_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_twonr_idx`"/>
+			<one-to-many entity-name="TwoNR"/>
+		</list>
+		<list name="twonn" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`twonn_main_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_twonn_idx`"/>
+			<one-to-many entity-name="TwoNN"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.OneCNImpl" entity-name="OneCN" abstract="false" lazy="false" table="`onecn`">
+		<meta attribute="eclassName">OneCN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.OneCRImpl" entity-name="OneCR" abstract="false" lazy="false" table="`onecr`">
+		<meta attribute="eclassName">OneCR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.OneNNImpl" entity-name="OneNN" abstract="false" lazy="false" table="`onenn`">
+		<meta attribute="eclassName">OneNN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.OneNRImpl" entity-name="OneNR" abstract="false" lazy="false" table="`onenr`">
+		<meta attribute="eclassName">OneNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.TwoCNImpl" entity-name="TwoCN" abstract="false" lazy="false" table="`twocn`">
+		<meta attribute="eclassName">TwoCN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="twocn_main" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`twocn_main_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.TwoCRImpl" entity-name="TwoCR" abstract="false" lazy="false" table="`twocr`">
+		<meta attribute="eclassName">TwoCR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="twocr_main" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`twocr_main_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.TwoNNImpl" entity-name="TwoNN" abstract="false" lazy="false" table="`twonn`">
+		<meta attribute="eclassName">TwoNN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="twonn_main" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`twonn_main_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.TwoNRImpl" entity-name="TwoNR" abstract="false" lazy="false" table="`twonr`">
+		<meta attribute="eclassName">TwoNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="twonr_main" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`twonr_main_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1tonAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1tonAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ab5b7efca
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1tonAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,199 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.MainImpl" entity-name="Main" abstract="false" lazy="false" table="`main`">
+		<meta attribute="eclassName">Main</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="onecr" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="main_onecr">
+				<column name="`main_onecr_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_onecr_idx`"/>
+			<one-to-many entity-name="OneCR"/>
+		</list>
+		<list name="onecn" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="main_onecn">
+				<column name="`main_onecn_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_onecn_idx`"/>
+			<one-to-many entity-name="OneCN"/>
+		</list>
+		<list name="onenr" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="main_onenr">
+				<column name="`main_onenr_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_onenr_idx`"/>
+			<one-to-many entity-name="OneNR"/>
+		</list>
+		<list name="onenn" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="main_onenn">
+				<column name="`main_onenn_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_onenn_idx`"/>
+			<one-to-many entity-name="OneNN"/>
+		</list>
+		<list name="twocr" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="main_twocr">
+				<column name="`twocr_main_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_twocr_idx`"/>
+			<one-to-many entity-name="TwoCR"/>
+		</list>
+		<list name="twocn" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="main_twocn">
+				<column name="`twocn_main_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_twocn_idx`"/>
+			<one-to-many entity-name="TwoCN"/>
+		</list>
+		<list name="twonr" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`twonr_main_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_twonr_idx`"/>
+			<one-to-many entity-name="TwoNR"/>
+		</list>
+		<list name="twonn" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`twonn_main_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`main_twonn_idx`"/>
+			<one-to-many entity-name="TwoNN"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.OneCNImpl" entity-name="OneCN" abstract="false" lazy="false" table="`onecn`">
+		<meta attribute="eclassName">OneCN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.OneCRImpl" entity-name="OneCR" abstract="false" lazy="false" table="`onecr`">
+		<meta attribute="eclassName">OneCR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.OneNNImpl" entity-name="OneNN" abstract="false" lazy="false" table="`onenn`">
+		<meta attribute="eclassName">OneNN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.OneNRImpl" entity-name="OneNR" abstract="false" lazy="false" table="`onenr`">
+		<meta attribute="eclassName">OneNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.TwoCNImpl" entity-name="TwoCN" abstract="false" lazy="false" table="`twocn`">
+		<meta attribute="eclassName">TwoCN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="twocn_main" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`twocn_main_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.TwoCRImpl" entity-name="TwoCR" abstract="false" lazy="false" table="`twocr`">
+		<meta attribute="eclassName">TwoCR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="twocr_main" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`twocr_main_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.TwoNNImpl" entity-name="TwoNN" abstract="false" lazy="false" table="`twonn`">
+		<meta attribute="eclassName">TwoNN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="twonn_main" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`twonn_main_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl.TwoNRImpl" entity-name="TwoNR" abstract="false" lazy="false" table="`twonr`">
+		<meta attribute="eclassName">TwoNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relation1ton</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="main" entity-name="Main" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="twonr_main" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`twonr_main_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/RelationntomAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/RelationntomAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..110484a5a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/RelationntomAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,127 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl.MainImpl" entity-name="Main" abstract="false" lazy="false" discriminator-value="Main" table="`main`">
+		<meta attribute="eclassName">Main</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relationntom</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 type="string">
+			<column name="dtype" index="maindtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="multinr" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`main_multinr`">
+			<key update="true">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`main_multinr_idx`"/>
+			<many-to-many entity-name="MultiNR" unique="false" foreign-key="main_multinr">
+				<column name="`multinr_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="multirn" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`main_multirn`">
+			<key update="true">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`main_multirn_idx`"/>
+			<many-to-many entity-name="MultiRN" unique="false" foreign-key="main_multirn">
+				<column name="`multirn_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="multinn" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`main_multinn`">
+			<key update="true">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`main_multinn_idx`"/>
+			<many-to-many entity-name="MultiNN" unique="false" foreign-key="main_multinn">
+				<column name="`multinn_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl.MultiNNImpl" entity-name="MultiNN" abstract="false" lazy="false" discriminator-value="MultiNN" table="`multinn`">
+		<meta attribute="eclassName">MultiNN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relationntom</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 type="string">
+			<column name="dtype" index="multinndtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`multinn_main`">
+			<key update="true">
+				<column name="`multinn_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`multinn_main_idx`"/>
+			<many-to-many entity-name="Main" unique="false" foreign-key="multinn_main">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl.MultiNRImpl" entity-name="MultiNR" abstract="false" lazy="false" discriminator-value="MultiNR" table="`multinr`">
+		<meta attribute="eclassName">MultiNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relationntom</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 type="string">
+			<column name="dtype" index="multinrdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`multinr_main`">
+			<key update="true">
+				<column name="`multinr_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`multinr_main_idx`"/>
+			<many-to-many entity-name="Main" unique="false" foreign-key="multinr_main">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl.MultiRNImpl" entity-name="MultiRN" abstract="false" lazy="false" discriminator-value="MultiRN" table="`multirn`">
+		<meta attribute="eclassName">MultiRN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relationntom</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 type="string">
+			<column name="dtype" index="multirndtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`multirn_main`">
+			<key update="true">
+				<column name="`multirn_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`multirn_main_idx`"/>
+			<many-to-many entity-name="Main" unique="false" foreign-key="multirn_main">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/RelationntomAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/RelationntomAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..41aa59e9c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/RelationntomAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,115 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl.MainImpl" entity-name="Main" abstract="false" lazy="false" table="`main`">
+		<meta attribute="eclassName">Main</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relationntom</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="multinr" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`main_multinr`">
+			<key update="true">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`main_multinr_idx`"/>
+			<many-to-many entity-name="MultiNR" unique="false" foreign-key="main_multinr">
+				<column name="`multinr_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="multirn" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`main_multirn`">
+			<key update="true">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`main_multirn_idx`"/>
+			<many-to-many entity-name="MultiRN" unique="false" foreign-key="main_multirn">
+				<column name="`multirn_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="multinn" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`main_multinn`">
+			<key update="true">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`main_multinn_idx`"/>
+			<many-to-many entity-name="MultiNN" unique="false" foreign-key="main_multinn">
+				<column name="`multinn_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl.MultiNNImpl" entity-name="MultiNN" abstract="false" lazy="false" table="`multinn`">
+		<meta attribute="eclassName">MultiNN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relationntom</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`multinn_main`">
+			<key update="true">
+				<column name="`multinn_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`multinn_main_idx`"/>
+			<many-to-many entity-name="Main" unique="false" foreign-key="multinn_main">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl.MultiNRImpl" entity-name="MultiNR" abstract="false" lazy="false" table="`multinr`">
+		<meta attribute="eclassName">MultiNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relationntom</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`multinr_main`">
+			<key update="true">
+				<column name="`multinr_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`multinr_main_idx`"/>
+			<many-to-many entity-name="Main" unique="false" foreign-key="multinr_main">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl.MultiRNImpl" entity-name="MultiRN" abstract="false" lazy="false" table="`multirn`">
+		<meta attribute="eclassName">MultiRN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relationntom</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`multirn_main`">
+			<key update="true">
+				<column name="`multirn_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`multirn_main_idx`"/>
+			<many-to-many entity-name="Main" unique="false" foreign-key="multirn_main">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/RelationntomAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/RelationntomAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..41aa59e9c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/RelationntomAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,115 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl.MainImpl" entity-name="Main" abstract="false" lazy="false" table="`main`">
+		<meta attribute="eclassName">Main</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relationntom</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="multinr" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`main_multinr`">
+			<key update="true">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`main_multinr_idx`"/>
+			<many-to-many entity-name="MultiNR" unique="false" foreign-key="main_multinr">
+				<column name="`multinr_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="multirn" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`main_multirn`">
+			<key update="true">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`main_multirn_idx`"/>
+			<many-to-many entity-name="MultiRN" unique="false" foreign-key="main_multirn">
+				<column name="`multirn_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="multinn" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`main_multinn`">
+			<key update="true">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`main_multinn_idx`"/>
+			<many-to-many entity-name="MultiNN" unique="false" foreign-key="main_multinn">
+				<column name="`multinn_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl.MultiNNImpl" entity-name="MultiNN" abstract="false" lazy="false" table="`multinn`">
+		<meta attribute="eclassName">MultiNN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relationntom</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`multinn_main`">
+			<key update="true">
+				<column name="`multinn_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`multinn_main_idx`"/>
+			<many-to-many entity-name="Main" unique="false" foreign-key="multinn_main">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl.MultiNRImpl" entity-name="MultiNR" abstract="false" lazy="false" table="`multinr`">
+		<meta attribute="eclassName">MultiNR</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relationntom</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`multinr_main`">
+			<key update="true">
+				<column name="`multinr_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`multinr_main_idx`"/>
+			<many-to-many entity-name="Main" unique="false" foreign-key="multinr_main">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl.MultiRNImpl" entity-name="MultiRN" abstract="false" lazy="false" table="`multirn`">
+		<meta attribute="eclassName">MultiRN</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/relation/relationntom</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`multirn_main`">
+			<key update="true">
+				<column name="`multirn_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`multirn_main_idx`"/>
+			<many-to-many entity-name="Main" unique="false" foreign-key="multirn_main">
+				<column name="`main_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..3106c4758
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,133 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="com.example.car.impl.CarFrameImpl" entity-name="CarFrame" abstract="false" lazy="false" discriminator-value="CarFrame" table="`carframe`">
+		<meta attribute="eclassName">CarFrame</meta>
+		<meta attribute="epackage">http://www.example.com/car.xsd</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 type="string">
+			<column name="dtype" index="carframedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="carWheel" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="carframe_carwheel">
+				<column name="`carframe_carwheel_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`carframe_carwheel_idx`"/>
+			<one-to-many entity-name="CarWheel"/>
+		</list>
+		<many-to-one name="carLinkRef" entity-name="CarLink" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="carframe_carlinkref" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`carlink_carlinkref_e_id`"/>
+		</many-to-one>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="com.example.car.impl.CarLinkImpl" entity-name="CarLink" abstract="false" lazy="false" discriminator-value="CarLink" table="`carlink`">
+		<meta attribute="eclassName">CarLink</meta>
+		<meta attribute="epackage">http://www.example.com/car.xsd</meta>
+		<id name="carLinkId" type="java.lang.String">
+			<column not-null="true" unique="false" name="`carlinkid`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="carlinkdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="com.example.car.impl.CarsListImpl" entity-name="CarsList" abstract="false" lazy="false" discriminator-value="CarsList" table="`carslist`">
+		<meta attribute="eclassName">CarsList</meta>
+		<meta attribute="epackage">http://www.example.com/car.xsd</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 type="string">
+			<column name="dtype" index="carslistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="carType" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="carslist_cartype">
+				<column name="`carslist_cartype_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`carslist_cartype_idx`"/>
+			<one-to-many entity-name="CarType"/>
+		</list>
+		<list name="carLink" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="carslist_carlink">
+				<column name="`carslist_carlink_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`carslist_carlink_idx`"/>
+			<one-to-many entity-name="CarLink"/>
+		</list>
+	</class>
+	<class name="com.example.car.impl.CarTireImpl" entity-name="CarTire" abstract="false" lazy="false" discriminator-value="CarTire" table="`cartire`">
+		<meta attribute="eclassName">CarTire</meta>
+		<meta attribute="epackage">http://www.example.com/car.xsd</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="cartiredtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="com.example.car.impl.CarTypeImpl" entity-name="CarType" abstract="false" lazy="false" discriminator-value="CarType" table="`cartype`">
+		<meta attribute="eclassName">CarType</meta>
+		<meta attribute="epackage">http://www.example.com/car.xsd</meta>
+		<id name="carID" type="java.lang.String">
+			<column not-null="true" unique="false" name="`carid`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="cartypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="carFrame" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="cartype_carframe">
+				<column name="`cartype_carframe_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`cartype_carframe_idx`"/>
+			<one-to-many entity-name="CarFrame"/>
+		</list>
+	</class>
+	<class name="com.example.car.impl.CarWheelImpl" entity-name="CarWheel" abstract="false" lazy="false" discriminator-value="CarWheel" table="`carwheel`">
+		<meta attribute="eclassName">CarWheel</meta>
+		<meta attribute="epackage">http://www.example.com/car.xsd</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 type="string">
+			<column name="dtype" index="carwheeldtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="carTire" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="carwheel_cartire">
+				<column name="`carwheel_cartire_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`carwheel_cartire_idx`"/>
+			<one-to-many entity-name="CarTire"/>
+		</list>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4239ed1c3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,115 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="com.example.car.impl.CarFrameImpl" entity-name="CarFrame" abstract="false" lazy="false" table="`carframe`">
+		<meta attribute="eclassName" inherit="false">CarFrame</meta>
+		<meta attribute="epackage" inherit="false">http://www.example.com/car.xsd</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="carWheel" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="carframe_carwheel">
+				<column name="`carframe_carwheel_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`carframe_carwheel_idx`"/>
+			<one-to-many entity-name="CarWheel"/>
+		</list>
+		<many-to-one name="carLinkRef" entity-name="CarLink" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="carframe_carlinkref" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`carlink_carlinkref_e_id`"/>
+		</many-to-one>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="com.example.car.impl.CarLinkImpl" entity-name="CarLink" abstract="false" lazy="false" table="`carlink`">
+		<meta attribute="eclassName" inherit="false">CarLink</meta>
+		<meta attribute="epackage" inherit="false">http://www.example.com/car.xsd</meta>
+		<id name="carLinkId" type="java.lang.String">
+			<column not-null="true" unique="false" name="`carlinkid`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="com.example.car.impl.CarsListImpl" entity-name="CarsList" abstract="false" lazy="false" table="`carslist`">
+		<meta attribute="eclassName" inherit="false">CarsList</meta>
+		<meta attribute="epackage" inherit="false">http://www.example.com/car.xsd</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="carType" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="carslist_cartype">
+				<column name="`carslist_cartype_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`carslist_cartype_idx`"/>
+			<one-to-many entity-name="CarType"/>
+		</list>
+		<list name="carLink" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="carslist_carlink">
+				<column name="`carslist_carlink_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`carslist_carlink_idx`"/>
+			<one-to-many entity-name="CarLink"/>
+		</list>
+	</class>
+	<class name="com.example.car.impl.CarTireImpl" entity-name="CarTire" abstract="false" lazy="false" table="`cartire`">
+		<meta attribute="eclassName" inherit="false">CarTire</meta>
+		<meta attribute="epackage" inherit="false">http://www.example.com/car.xsd</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<class name="com.example.car.impl.CarTypeImpl" entity-name="CarType" abstract="false" lazy="false" table="`cartype`">
+		<meta attribute="eclassName" inherit="false">CarType</meta>
+		<meta attribute="epackage" inherit="false">http://www.example.com/car.xsd</meta>
+		<id name="carID" type="java.lang.String">
+			<column not-null="true" unique="false" name="`carid`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="carFrame" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="cartype_carframe">
+				<column name="`cartype_carframe_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`cartype_carframe_idx`"/>
+			<one-to-many entity-name="CarFrame"/>
+		</list>
+	</class>
+	<class name="com.example.car.impl.CarWheelImpl" entity-name="CarWheel" abstract="false" lazy="false" table="`carwheel`">
+		<meta attribute="eclassName" inherit="false">CarWheel</meta>
+		<meta attribute="epackage" inherit="false">http://www.example.com/car.xsd</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="carTire" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="carwheel_cartire">
+				<column name="`carwheel_cartire_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`carwheel_cartire_idx`"/>
+			<one-to-many entity-name="CarTire"/>
+		</list>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4239ed1c3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,115 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="com.example.car.impl.CarFrameImpl" entity-name="CarFrame" abstract="false" lazy="false" table="`carframe`">
+		<meta attribute="eclassName" inherit="false">CarFrame</meta>
+		<meta attribute="epackage" inherit="false">http://www.example.com/car.xsd</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="carWheel" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="carframe_carwheel">
+				<column name="`carframe_carwheel_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`carframe_carwheel_idx`"/>
+			<one-to-many entity-name="CarWheel"/>
+		</list>
+		<many-to-one name="carLinkRef" entity-name="CarLink" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="carframe_carlinkref" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`carlink_carlinkref_e_id`"/>
+		</many-to-one>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="com.example.car.impl.CarLinkImpl" entity-name="CarLink" abstract="false" lazy="false" table="`carlink`">
+		<meta attribute="eclassName" inherit="false">CarLink</meta>
+		<meta attribute="epackage" inherit="false">http://www.example.com/car.xsd</meta>
+		<id name="carLinkId" type="java.lang.String">
+			<column not-null="true" unique="false" name="`carlinkid`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="com.example.car.impl.CarsListImpl" entity-name="CarsList" abstract="false" lazy="false" table="`carslist`">
+		<meta attribute="eclassName" inherit="false">CarsList</meta>
+		<meta attribute="epackage" inherit="false">http://www.example.com/car.xsd</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="carType" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="carslist_cartype">
+				<column name="`carslist_cartype_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`carslist_cartype_idx`"/>
+			<one-to-many entity-name="CarType"/>
+		</list>
+		<list name="carLink" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="carslist_carlink">
+				<column name="`carslist_carlink_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`carslist_carlink_idx`"/>
+			<one-to-many entity-name="CarLink"/>
+		</list>
+	</class>
+	<class name="com.example.car.impl.CarTireImpl" entity-name="CarTire" abstract="false" lazy="false" table="`cartire`">
+		<meta attribute="eclassName" inherit="false">CarTire</meta>
+		<meta attribute="epackage" inherit="false">http://www.example.com/car.xsd</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<class name="com.example.car.impl.CarTypeImpl" entity-name="CarType" abstract="false" lazy="false" table="`cartype`">
+		<meta attribute="eclassName" inherit="false">CarType</meta>
+		<meta attribute="epackage" inherit="false">http://www.example.com/car.xsd</meta>
+		<id name="carID" type="java.lang.String">
+			<column not-null="true" unique="false" name="`carid`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="carFrame" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="cartype_carframe">
+				<column name="`cartype_carframe_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`cartype_carframe_idx`"/>
+			<one-to-many entity-name="CarFrame"/>
+		</list>
+	</class>
+	<class name="com.example.car.impl.CarWheelImpl" entity-name="CarWheel" abstract="false" lazy="false" table="`carwheel`">
+		<meta attribute="eclassName" inherit="false">CarWheel</meta>
+		<meta attribute="epackage" inherit="false">http://www.example.com/car.xsd</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="carTire" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="carwheel_cartire">
+				<column name="`carwheel_cartire_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`carwheel_cartire_idx`"/>
+			<one-to-many entity-name="CarTire"/>
+		</list>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CatalogResourceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CatalogResourceAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ae02795c3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CatalogResourceAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,121 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.CatalogTypeImpl" entity-name="CatalogType" abstract="false" lazy="false" discriminator-value="CatalogType" table="`catalogtype`">
+		<meta attribute="eclassName">CatalogType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="catalogtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="catalogtype_subcatalog">
+				<column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`catalogtype_subcatalog_idx`"/>
+			<one-to-many entity-name="CatalogType"/>
+		</list>
+		<list name="product" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="catalogtype_product">
+				<column name="`catalogtype_product_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`catalogtype_product_idx`"/>
+			<one-to-many entity-name="ProductType"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.PriceTypeImpl" entity-name="PriceType" abstract="false" lazy="false" discriminator-value="PriceType" table="`pricetype`">
+		<meta attribute="eclassName">PriceType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</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 type="string">
+			<column name="dtype" index="pricetypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="quantityTo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`quantityto`"/>
+		</property>
+		<many-to-one name="supplier" entity-name="SupplierType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="pricetype_supplier" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`suppliertype_supplier_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`">
+		<meta attribute="eclassName">ProductType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id name="code" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="producttypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`description`"/>
+		</property>
+		<list name="remark" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="producttype_remark">
+				<column name="`producttype_remark_code`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_remark_idx`"/>
+			<one-to-many entity-name="StringType"/>
+		</list>
+		<many-to-one name="price" entity-name="PriceType" lazy="false" cascade="all" foreign-key="producttype_price" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`pricetype_price_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.StringTypeImpl" entity-name="StringType" abstract="false" lazy="false" discriminator-value="StringType" table="`stringtype`">
+		<meta attribute="eclassName">StringType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</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 type="string">
+			<column name="dtype" index="stringtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<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" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.SupplierTypeImpl" entity-name="SupplierType" abstract="false" lazy="false" discriminator-value="SupplierType" table="`suppliertype`">
+		<meta attribute="eclassName">SupplierType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</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 type="string">
+			<column name="dtype" index="suppliertypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="noOfEmployees" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`noofemployees`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CatalogResourceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CatalogResourceAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f2f4a71b7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CatalogResourceAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,106 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.CatalogTypeImpl" entity-name="CatalogType" abstract="false" lazy="false" table="`catalogtype`">
+		<meta attribute="eclassName" inherit="false">CatalogType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="catalogtype_subcatalog">
+				<column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`catalogtype_subcatalog_idx`"/>
+			<one-to-many entity-name="CatalogType"/>
+		</list>
+		<list name="product" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="catalogtype_product">
+				<column name="`catalogtype_product_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`catalogtype_product_idx`"/>
+			<one-to-many entity-name="ProductType"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.PriceTypeImpl" entity-name="PriceType" abstract="false" lazy="false" table="`pricetype`">
+		<meta attribute="eclassName" inherit="false">PriceType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="quantityTo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`quantityto`"/>
+		</property>
+		<many-to-one name="supplier" entity-name="SupplierType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="pricetype_supplier" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`suppliertype_supplier_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" table="`producttype`">
+		<meta attribute="eclassName" inherit="false">ProductType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id name="code" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`description`"/>
+		</property>
+		<list name="remark" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="producttype_remark">
+				<column name="`producttype_remark_code`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_remark_idx`"/>
+			<one-to-many entity-name="StringType"/>
+		</list>
+		<many-to-one name="price" entity-name="PriceType" lazy="false" cascade="all" foreign-key="producttype_price" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`pricetype_price_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.StringTypeImpl" entity-name="StringType" abstract="false" lazy="false" table="`stringtype`">
+		<meta attribute="eclassName" inherit="false">StringType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.SupplierTypeImpl" entity-name="SupplierType" abstract="false" lazy="false" table="`suppliertype`">
+		<meta attribute="eclassName" inherit="false">SupplierType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="noOfEmployees" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`noofemployees`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CatalogResourceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CatalogResourceAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f2f4a71b7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CatalogResourceAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,106 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.CatalogTypeImpl" entity-name="CatalogType" abstract="false" lazy="false" table="`catalogtype`">
+		<meta attribute="eclassName" inherit="false">CatalogType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="catalogtype_subcatalog">
+				<column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`catalogtype_subcatalog_idx`"/>
+			<one-to-many entity-name="CatalogType"/>
+		</list>
+		<list name="product" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="catalogtype_product">
+				<column name="`catalogtype_product_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`catalogtype_product_idx`"/>
+			<one-to-many entity-name="ProductType"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.PriceTypeImpl" entity-name="PriceType" abstract="false" lazy="false" table="`pricetype`">
+		<meta attribute="eclassName" inherit="false">PriceType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="quantityTo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`quantityto`"/>
+		</property>
+		<many-to-one name="supplier" entity-name="SupplierType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="pricetype_supplier" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`suppliertype_supplier_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" table="`producttype`">
+		<meta attribute="eclassName" inherit="false">ProductType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id name="code" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`description`"/>
+		</property>
+		<list name="remark" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="producttype_remark">
+				<column name="`producttype_remark_code`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`producttype_remark_idx`"/>
+			<one-to-many entity-name="StringType"/>
+		</list>
+		<many-to-one name="price" entity-name="PriceType" lazy="false" cascade="all" foreign-key="producttype_price" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`pricetype_price_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.StringTypeImpl" entity-name="StringType" abstract="false" lazy="false" table="`stringtype`">
+		<meta attribute="eclassName" inherit="false">StringType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.catalog.impl.SupplierTypeImpl" entity-name="SupplierType" abstract="false" lazy="false" table="`suppliertype`">
+		<meta attribute="eclassName" inherit="false">SupplierType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="noOfEmployees" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`noofemployees`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ClaimAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ClaimAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e4730aa52
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ClaimAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,67 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.claim.impl.ClaimImpl" entity-name="Claim" abstract="false" lazy="false" discriminator-value="Claim" table="`pclm_nprc_clm`">
+		<meta attribute="eclassName">Claim</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/claim</meta>
+		<composite-id name="claimCompositeKey" class="org.eclipse.emf.teneo.samples.emf.sample.claim.impl.ClaimCompositeKeyImpl">
+			<key-property name="claimNumber" type="java.lang.String">
+				<column not-null="false" unique="false" name="`clm_nbr`" unique-key="c0"/>
+			</key-property>
+			<key-property name="claimExtensionNumber" type="java.lang.String">
+				<column not-null="false" unique="false" name="`clm_ext_nbr`" unique-key="c0"/>
+			</key-property>
+		</composite-id>
+		<discriminator type="string">
+			<column name="dtype" index="PCLM_NPRC_CLMdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="billingName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`billing_name`" length="50"/>
+		</property>
+		<property name="claimGroupVSPId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`clm_grp_vsp_id`" length="3"/>
+		</property>
+		<property name="claimStatus" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`clm_status`" length="2"/>
+		</property>
+		<bag name="claimLine" inverse="true" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="claim_claimline">
+				<column name="`clm_nbr`" not-null="false" unique="false"/>
+				<column name="`clm_ext_nbr`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="ClaimLine"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.claim.impl.ClaimLineImpl" entity-name="ClaimLine" abstract="false" lazy="false" discriminator-value="ClaimLine" table="`pclm_nprc_clmln`">
+		<meta attribute="eclassName">ClaimLine</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/claim</meta>
+		<composite-id name="claimLineCompositeKey" class="org.eclipse.emf.teneo.samples.emf.sample.claim.impl.ClaimLineCompositeKeyImpl">
+			<key-many-to-one name="claim" entity-name="Claim" foreign-key="claimlinecompositekey_claim" lazy="false">
+				<column not-null="false" unique="false" name="`clm_nbr`" unique-key="c0"/>
+				<column not-null="false" unique="false" name="`clm_ext_nbr`" unique-key="c0"/>
+			</key-many-to-one>
+			<key-property name="claimLineNumber" type="java.lang.String">
+				<column not-null="false" unique="false" name="`clmln_nbr`" unique-key="c0"/>
+			</key-property>
+		</composite-id>
+		<discriminator type="string">
+			<column name="dtype" index="PCLM_NPRC_CLMLNdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="claimLineBilledAmount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`clmln_bill_amt`"/>
+		</property>
+		<property name="serviceCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`svc_cd`"/>
+		</property>
+		<property name="claimLineStatus" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`clmln_status`" length="2"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ClaimAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ClaimAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1858a6aab
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ClaimAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,65 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.claim.impl.ClaimImpl" entity-name="Claim" abstract="false" lazy="false" table="`pclm_nprc_clm`">
+		<meta attribute="eclassName" inherit="false">Claim</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/claim</meta>
+		<composite-id name="claimCompositeKey" class="org.eclipse.emf.teneo.samples.emf.sample.claim.impl.ClaimCompositeKeyImpl" access="org.eclipse.emf.teneo.hibernate.mapping.property.EReferencePropertyHandler">
+			<meta attribute="eclassName" inherit="false">ClaimCompositeKey</meta>
+			<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/claim</meta>
+			<key-property name="claimNumber" type="java.lang.String">
+				<column not-null="false" unique="false" name="`clm_nbr`" unique-key="c0"/>
+			</key-property>
+			<key-property name="claimExtensionNumber" type="java.lang.String">
+				<column not-null="false" unique="false" name="`clm_ext_nbr`" unique-key="c0"/>
+			</key-property>
+		</composite-id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="billingName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`billing_name`" length="50"/>
+		</property>
+		<property name="claimGroupVSPId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`clm_grp_vsp_id`" length="3"/>
+		</property>
+		<property name="claimStatus" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`clm_status`" length="2"/>
+		</property>
+		<bag name="claimLine" inverse="true" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="claim_claimline">
+				<column name="`clm_nbr`" not-null="false" unique="false"/>
+				<column name="`clm_ext_nbr`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="ClaimLine"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.claim.impl.ClaimLineImpl" entity-name="ClaimLine" abstract="false" lazy="false" table="`pclm_nprc_clmln`">
+		<meta attribute="eclassName" inherit="false">ClaimLine</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/claim</meta>
+		<composite-id name="claimLineCompositeKey" class="org.eclipse.emf.teneo.samples.emf.sample.claim.impl.ClaimLineCompositeKeyImpl" access="org.eclipse.emf.teneo.hibernate.mapping.property.EReferencePropertyHandler">
+			<meta attribute="eclassName" inherit="false">ClaimLineCompositeKey</meta>
+			<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/claim</meta>
+			<key-many-to-one name="claim" entity-name="Claim" foreign-key="claimlinecompositekey_claim" lazy="false">
+				<column not-null="false" unique="false" name="`clm_nbr`" unique-key="c0"/>
+				<column not-null="false" unique="false" name="`clm_ext_nbr`" unique-key="c0"/>
+			</key-many-to-one>
+			<key-property name="claimLineNumber" type="java.lang.String">
+				<column not-null="false" unique="false" name="`clmln_nbr`" unique-key="c0"/>
+			</key-property>
+		</composite-id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="claimLineBilledAmount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`clmln_bill_amt`"/>
+		</property>
+		<property name="serviceCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`svc_cd`"/>
+		</property>
+		<property name="claimLineStatus" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`clmln_status`" length="2"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ClaimAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ClaimAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1858a6aab
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ClaimAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,65 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.claim.impl.ClaimImpl" entity-name="Claim" abstract="false" lazy="false" table="`pclm_nprc_clm`">
+		<meta attribute="eclassName" inherit="false">Claim</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/claim</meta>
+		<composite-id name="claimCompositeKey" class="org.eclipse.emf.teneo.samples.emf.sample.claim.impl.ClaimCompositeKeyImpl" access="org.eclipse.emf.teneo.hibernate.mapping.property.EReferencePropertyHandler">
+			<meta attribute="eclassName" inherit="false">ClaimCompositeKey</meta>
+			<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/claim</meta>
+			<key-property name="claimNumber" type="java.lang.String">
+				<column not-null="false" unique="false" name="`clm_nbr`" unique-key="c0"/>
+			</key-property>
+			<key-property name="claimExtensionNumber" type="java.lang.String">
+				<column not-null="false" unique="false" name="`clm_ext_nbr`" unique-key="c0"/>
+			</key-property>
+		</composite-id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="billingName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`billing_name`" length="50"/>
+		</property>
+		<property name="claimGroupVSPId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`clm_grp_vsp_id`" length="3"/>
+		</property>
+		<property name="claimStatus" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`clm_status`" length="2"/>
+		</property>
+		<bag name="claimLine" inverse="true" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="claim_claimline">
+				<column name="`clm_nbr`" not-null="false" unique="false"/>
+				<column name="`clm_ext_nbr`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="ClaimLine"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.claim.impl.ClaimLineImpl" entity-name="ClaimLine" abstract="false" lazy="false" table="`pclm_nprc_clmln`">
+		<meta attribute="eclassName" inherit="false">ClaimLine</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/claim</meta>
+		<composite-id name="claimLineCompositeKey" class="org.eclipse.emf.teneo.samples.emf.sample.claim.impl.ClaimLineCompositeKeyImpl" access="org.eclipse.emf.teneo.hibernate.mapping.property.EReferencePropertyHandler">
+			<meta attribute="eclassName" inherit="false">ClaimLineCompositeKey</meta>
+			<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/claim</meta>
+			<key-many-to-one name="claim" entity-name="Claim" foreign-key="claimlinecompositekey_claim" lazy="false">
+				<column not-null="false" unique="false" name="`clm_nbr`" unique-key="c0"/>
+				<column not-null="false" unique="false" name="`clm_ext_nbr`" unique-key="c0"/>
+			</key-many-to-one>
+			<key-property name="claimLineNumber" type="java.lang.String">
+				<column not-null="false" unique="false" name="`clmln_nbr`" unique-key="c0"/>
+			</key-property>
+		</composite-id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="claimLineBilledAmount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`clmln_bill_amt`"/>
+		</property>
+		<property name="serviceCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`svc_cd`"/>
+		</property>
+		<property name="claimLineStatus" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`clmln_status`" length="2"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EcoreAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EcoreAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..727f0ce8c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EcoreAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,533 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<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.EJavaClass" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EJavaClass</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="type.Duration" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">Duration</param>
+	</typedef>
+	<typedef name="type.ENTITIES" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ENTITIES</param>
+	</typedef>
+	<typedef name="type.ENTITIESBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ENTITIESBase</param>
+	</typedef>
+	<typedef name="type.IDREFS" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">IDREFS</param>
+	</typedef>
+	<typedef name="type.IDREFSBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">IDREFSBase</param>
+	</typedef>
+	<typedef name="type.NMTOKENS" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NMTOKENS</param>
+	</typedef>
+	<typedef name="type.NMTOKENSBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NMTOKENSBase</param>
+	</typedef>
+	<typedef name="type.NOTATION" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NOTATION</param>
+	</typedef>
+	<typedef name="type.QName" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">QName</param>
+	</typedef>
+	<typedef name="type.ShortObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ShortObject</param>
+	</typedef>
+	<typedef name="type.UnsignedByteObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">UnsignedByteObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.ecore.impl.BasicEObjectImpl" entity-name="ecore_EObject" abstract="false" lazy="false" discriminator-value="ecore_EObject" table="`ecore_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 type="string">
+			<column name="dtype" index="ecore_eobjectdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.ecore.impl.EModelElementImpl" entity-name="EModelElement" abstract="true" lazy="false" extends="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" foreign-key="emodelelement_eannotations">
+				<column name="`eannotation_emodelelement_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`emodelelement_eannotations_idx`"/>
+			<one-to-many entity-name="EAnnotation"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.ecore.impl.ENamedElementImpl" entity-name="ENamedElement" abstract="true" lazy="false" extends="EModelElement" discriminator-value="ENamedElement">
+		<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 name="org.eclipse.emf.ecore.impl.ETypedElementImpl" entity-name="ETypedElement" abstract="true" lazy="false" extends="ENamedElement" discriminator-value="ETypedElement">
+		<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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="etypedelement_etype" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`eclassifier_etype_e_id`"/>
+		</many-to-one>
+		<many-to-one name="eGenericType" entity-name="EGenericType" lazy="false" cascade="all" foreign-key="etypedelement_egenerictype" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`egenerictype_egenerictype_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass name="org.eclipse.emf.ecore.impl.EStructuralFeatureImpl" entity-name="EStructuralFeature" abstract="true" lazy="false" extends="ETypedElement" discriminator-value="EStructuralFeature">
+		<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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="estructuralfeature_econtainingclass" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`estructuralfeature_econtainingclass_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass name="org.eclipse.emf.ecore.impl.EAttributeImpl" entity-name="EAttribute" abstract="false" lazy="false" extends="EStructuralFeature" discriminator-value="EAttribute">
+		<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 name="org.eclipse.emf.ecore.impl.EAnnotationImpl" entity-name="EAnnotation" abstract="false" lazy="false" extends="EModelElement" discriminator-value="EAnnotation">
+		<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>
+		<map name="details" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`eannotation_details_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<many-to-one name="eModelElement" entity-name="EModelElement" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="eannotation_emodelelement" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`eannotation_emodelelement_e_id`"/>
+		</many-to-one>
+		<list name="contents" table="`eannotation_contents`" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eannotation_contents">
+				<column name="`eannotation_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`eannotation_contents_idx`"/>
+			<many-to-any id-type="long" meta-type="string">
+				<column not-null="false" unique="false" name="`contents_type`"/>
+				<column not-null="false" unique="false" name="`contents_id`"/>
+			</many-to-any>
+		</list>
+		<list name="references" table="`eannotation_references`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="eannotation_references">
+				<column name="`eannotation_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`eannotation_references_idx`"/>
+			<many-to-any id-type="long" meta-type="string">
+				<column not-null="false" unique="false" name="`references_type`"/>
+				<column not-null="false" unique="false" name="`references_id`"/>
+			</many-to-any>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.ecore.impl.EClassifierImpl" entity-name="EClassifier" abstract="true" lazy="false" extends="ENamedElement" discriminator-value="EClassifier">
+		<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>
+		<property name="instanceTypeName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`instancetypename`"/>
+		</property>
+		<many-to-one name="ePackage" entity-name="EPackage" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="eclassifier_epackage" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`eclassifier_epackage_e_id`"/>
+		</many-to-one>
+		<list name="eTypeParameters" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eclassifier_etypeparameters">
+				<column name="`eclassifier_etypeparameters_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eclassifier_etypeparameters_idx`"/>
+			<one-to-many entity-name="ETypeParameter"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.ecore.impl.EClassImpl" entity-name="EClass" abstract="false" lazy="false" extends="EClassifier" discriminator-value="EClass">
+		<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" table="`eclass_eclass`">
+			<key/>
+			<list-index column="`eclass_esupertypes_idx`"/>
+			<many-to-many entity-name="EClass" unique="false" foreign-key="eclass_esupertypes"/>
+		</list>
+		<list name="eOperations" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eclass_eoperations">
+				<column name="`eoperation_econtainingclass_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eclass_eoperations_idx`"/>
+			<one-to-many entity-name="EOperation"/>
+		</list>
+		<list name="eStructuralFeatures" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eclass_estructuralfeatures">
+				<column name="`estructuralfeature_econtainingclass_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eclass_estructuralfeatures_idx`"/>
+			<one-to-many entity-name="EStructuralFeature"/>
+		</list>
+		<list name="eGenericSuperTypes" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eclass_egenericsupertypes">
+				<column name="`eclass_egenericsupertypes_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eclass_egenericsupertypes_idx`"/>
+			<one-to-many entity-name="EGenericType"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.ecore.impl.EDataTypeImpl" entity-name="EDataType" abstract="false" lazy="false" extends="EClassifier" discriminator-value="EDataType">
+		<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 name="org.eclipse.emf.ecore.impl.EEnumImpl" 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" foreign-key="eenum_eliterals">
+				<column name="`eenumliteral_eenum_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eenum_eliterals_idx`"/>
+			<one-to-many entity-name="EEnumLiteral"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.ecore.impl.EEnumLiteralImpl" entity-name="EEnumLiteral" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="EEnumLiteral">
+		<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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="eenumliteral_eenum" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`eenumliteral_eenum_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass name="org.eclipse.emf.ecore.impl.EFactoryImpl" 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 name="org.eclipse.emf.ecore.impl.EOperationImpl" 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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="eoperation_econtainingclass" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`eoperation_econtainingclass_e_id`"/>
+		</many-to-one>
+		<list name="eTypeParameters" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eoperation_etypeparameters">
+				<column name="`eoperation_etypeparameters_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eoperation_etypeparameters_idx`"/>
+			<one-to-many entity-name="ETypeParameter"/>
+		</list>
+		<list name="eParameters" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eoperation_eparameters">
+				<column name="`eparameter_eoperation_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eoperation_eparameters_idx`"/>
+			<one-to-many entity-name="EParameter"/>
+		</list>
+		<list name="eExceptions" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="eoperation_eexceptions">
+				<column name="`eoperation_eexceptions_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eoperation_eexceptions_idx`"/>
+			<one-to-many entity-name="EClassifier"/>
+		</list>
+		<list name="eGenericExceptions" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eoperation_egenericexceptions">
+				<column name="`eoperation_egenericexceptions_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eoperation_egenericexceptions_idx`"/>
+			<one-to-many entity-name="EGenericType"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.ecore.impl.EPackageImpl" entity-name="EPackage" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="EPackage">
+		<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" foreign-key="epackage_eclassifiers">
+				<column name="`eclassifier_epackage_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`epackage_eclassifiers_idx`"/>
+			<one-to-many entity-name="EClassifier"/>
+		</list>
+		<list name="eSubpackages" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="epackage_esubpackages">
+				<column name="`epackage_esuperpackage_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`epackage_esubpackages_idx`"/>
+			<one-to-many entity-name="EPackage"/>
+		</list>
+		<many-to-one name="eSuperPackage" entity-name="EPackage" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="epackage_esuperpackage" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`epackage_esuperpackage_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass name="org.eclipse.emf.ecore.impl.EParameterImpl" 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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="eparameter_eoperation" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`eparameter_eoperation_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass name="org.eclipse.emf.ecore.impl.EReferenceImpl" entity-name="EReference" abstract="false" lazy="false" extends="EStructuralFeature" discriminator-value="EReference">
+		<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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ereference_eopposite" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ereference_eopposite_e_id`"/>
+		</many-to-one>
+		<list name="eKeys" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="ereference_ekeys">
+				<column name="`ereference_ekeys_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ereference_ekeys_idx`"/>
+			<one-to-many entity-name="EAttribute"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.ecore.impl.EGenericTypeImpl" entity-name="EGenericType" abstract="false" lazy="false" extends="ecore_EObject" discriminator-value="EGenericType">
+		<meta attribute="eclassName">EGenericType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<many-to-one name="eUpperBound" entity-name="EGenericType" lazy="false" cascade="all" foreign-key="egenerictype_eupperbound" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`egenerictype_eupperbound_e_id`"/>
+		</many-to-one>
+		<list name="eTypeArguments" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="egenerictype_etypearguments">
+				<column name="`egenerictype_etypearguments_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`egenerictype_etypearguments_idx`"/>
+			<one-to-many entity-name="EGenericType"/>
+		</list>
+		<many-to-one name="eLowerBound" entity-name="EGenericType" lazy="false" cascade="all" foreign-key="egenerictype_elowerbound" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`egenerictype_elowerbound_e_id`"/>
+		</many-to-one>
+		<many-to-one name="eTypeParameter" entity-name="ETypeParameter" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="egenerictype_etypeparameter" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`etypeparameter_etypeparameter_e_id`"/>
+		</many-to-one>
+		<many-to-one name="eClassifier" entity-name="EClassifier" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="egenerictype_eclassifier" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`eclassifier_eclassifier_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass name="org.eclipse.emf.ecore.impl.ETypeParameterImpl" entity-name="ETypeParameter" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="ETypeParameter">
+		<meta attribute="eclassName">ETypeParameter</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<list name="eBounds" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="etypeparameter_ebounds">
+				<column name="`etypeparameter_ebounds_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`etypeparameter_ebounds_idx`"/>
+			<one-to-many entity-name="EGenericType"/>
+		</list>
+	</subclass>
+	<class name="org.eclipse.emf.ecore.xml.type.impl.AnyTypeImpl" entity-name="AnyType" abstract="false" lazy="false" discriminator-value="AnyType" table="`anytype`">
+		<meta attribute="eclassName">AnyType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2003/XMLType</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 type="string">
+			<column name="dtype" index="anytypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="mixed" table="`anytype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`anytype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`anytype_mixed_idx`"/>
+			<one-to-many entity-name="AnyType_mixed"/>
+		</list>
+		<list name="anyAttribute" table="`anytype_anyattribute`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`anytype_anyattribute_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`anytype_anyattribute_idx`"/>
+			<one-to-many entity-name="AnyType_anyAttribute"/>
+		</list>
+	</class>
+	<class entity-name="AnyType_mixed" lazy="false" table="`anytype_mixed`">
+		<meta attribute="featureMap">AnyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="any" table="`mixed_anytype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_anytype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_anytype_any_idx`"/>
+			<one-to-many entity-name="AnyType_any"/>
+		</list>
+		<list name="anyAttribute" table="`mixed_anytype_anyattribute`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_anytype_anyattribute_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_anytype_anyattribute_idx`"/>
+			<one-to-many entity-name="AnyType_anyAttribute"/>
+		</list>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="AnyType_anyAttribute" lazy="false" table="`anytype_anyattribute`">
+		<meta attribute="featureMap">AnyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+	</class>
+	<class entity-name="AnyType_any" lazy="false" table="`anytype_any`">
+		<meta attribute="featureMap">AnyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.eclipse.emf.ecore.xml.type.impl.ProcessingInstructionImpl" entity-name="ProcessingInstruction" abstract="false" lazy="false" discriminator-value="ProcessingInstruction" table="`processinginstruction`">
+		<meta attribute="eclassName">ProcessingInstruction</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2003/XMLType</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 type="string">
+			<column name="dtype" index="processinginstructiondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`data`"/>
+		</property>
+		<property name="target" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`target`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.ecore.xml.type.impl.SimpleAnyTypeImpl" entity-name="SimpleAnyType" abstract="false" lazy="false" extends="AnyType" discriminator-value="SimpleAnyType">
+		<meta attribute="eclassName">SimpleAnyType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2003/XMLType</meta>
+		<many-to-one name="instanceType" entity-name="EDataType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="simpleanytype_instancetype" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`edatatype_instancetype_e_id`"/>
+		</many-to-one>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EcoreAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EcoreAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6b441b3aa
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EcoreAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,581 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<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.EJavaClass" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EJavaClass</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="type.Duration" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">Duration</param>
+	</typedef>
+	<typedef name="type.ENTITIES" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ENTITIES</param>
+	</typedef>
+	<typedef name="type.ENTITIESBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ENTITIESBase</param>
+	</typedef>
+	<typedef name="type.IDREFS" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">IDREFS</param>
+	</typedef>
+	<typedef name="type.IDREFSBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">IDREFSBase</param>
+	</typedef>
+	<typedef name="type.NMTOKENS" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NMTOKENS</param>
+	</typedef>
+	<typedef name="type.NMTOKENSBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NMTOKENSBase</param>
+	</typedef>
+	<typedef name="type.NOTATION" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NOTATION</param>
+	</typedef>
+	<typedef name="type.QName" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">QName</param>
+	</typedef>
+	<typedef name="type.ShortObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ShortObject</param>
+	</typedef>
+	<typedef name="type.UnsignedByteObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">UnsignedByteObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.ecore.impl.BasicEObjectImpl" entity-name="ecore_EObject" abstract="false" lazy="false" table="`ecore_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">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EModelElementImpl" entity-name="EModelElement" abstract="true" lazy="false" extends="ecore_EObject" table="`emodelelement`">
+		<meta attribute="eclassName">EModelElement</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<key>
+			<column name="`ecore_eobject_e_id`"/>
+		</key>
+		<list name="eAnnotations" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="emodelelement_eannotations">
+				<column name="`eannotation_emodelelement_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`emodelelement_eannotations_idx`"/>
+			<one-to-many entity-name="EAnnotation"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.ENamedElementImpl" 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_e_id`"/>
+		</key>
+		<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 name="org.eclipse.emf.ecore.impl.ETypedElementImpl" 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_e_id`"/>
+		</key>
+		<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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="etypedelement_etype" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`eclassifier_etype_e_id`"/>
+		</many-to-one>
+		<many-to-one name="eGenericType" entity-name="EGenericType" lazy="false" cascade="all" foreign-key="etypedelement_egenerictype" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`egenerictype_egenerictype_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EStructuralFeatureImpl" 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_e_id`"/>
+		</key>
+		<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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="estructuralfeature_econtainingclass" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`estructuralfeature_econtainingclass_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EAttributeImpl" 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_e_id`"/>
+		</key>
+		<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 name="org.eclipse.emf.ecore.impl.EAnnotationImpl" 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_e_id`"/>
+		</key>
+		<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>
+		<map name="details" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`eannotation_details_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<many-to-one name="eModelElement" entity-name="EModelElement" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="eannotation_emodelelement" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`eannotation_emodelelement_e_id`"/>
+		</many-to-one>
+		<list name="contents" table="`eannotation_contents`" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eannotation_contents">
+				<column name="`eannotation_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`eannotation_contents_idx`"/>
+			<many-to-any id-type="long" meta-type="string">
+				<column not-null="false" unique="false" name="`contents_type`"/>
+				<column not-null="false" unique="false" name="`contents_id`"/>
+			</many-to-any>
+		</list>
+		<list name="references" table="`eannotation_references`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="eannotation_references">
+				<column name="`eannotation_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`eannotation_references_idx`"/>
+			<many-to-any id-type="long" meta-type="string">
+				<column not-null="false" unique="false" name="`references_type`"/>
+				<column not-null="false" unique="false" name="`references_id`"/>
+			</many-to-any>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EClassifierImpl" 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_e_id`"/>
+		</key>
+		<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>
+		<property name="instanceTypeName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`instancetypename`"/>
+		</property>
+		<many-to-one name="ePackage" entity-name="EPackage" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="eclassifier_epackage" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`eclassifier_epackage_e_id`"/>
+		</many-to-one>
+		<list name="eTypeParameters" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eclassifier_etypeparameters">
+				<column name="`eclassifier_etypeparameters_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eclassifier_etypeparameters_idx`"/>
+			<one-to-many entity-name="ETypeParameter"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EClassImpl" 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_e_id`"/>
+		</key>
+		<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" table="`eclass_eclass`">
+			<key/>
+			<list-index column="`eclass_esupertypes_idx`"/>
+			<many-to-many entity-name="EClass" unique="false" foreign-key="eclass_esupertypes"/>
+		</list>
+		<list name="eOperations" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eclass_eoperations">
+				<column name="`eoperation_econtainingclass_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eclass_eoperations_idx`"/>
+			<one-to-many entity-name="EOperation"/>
+		</list>
+		<list name="eStructuralFeatures" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eclass_estructuralfeatures">
+				<column name="`estructuralfeature_econtainingclass_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eclass_estructuralfeatures_idx`"/>
+			<one-to-many entity-name="EStructuralFeature"/>
+		</list>
+		<list name="eGenericSuperTypes" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eclass_egenericsupertypes">
+				<column name="`eclass_egenericsupertypes_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eclass_egenericsupertypes_idx`"/>
+			<one-to-many entity-name="EGenericType"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EDataTypeImpl" 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_e_id`"/>
+		</key>
+		<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 name="org.eclipse.emf.ecore.impl.EEnumImpl" 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_e_id`"/>
+		</key>
+		<list name="eLiterals" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eenum_eliterals">
+				<column name="`eenumliteral_eenum_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eenum_eliterals_idx`"/>
+			<one-to-many entity-name="EEnumLiteral"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EEnumLiteralImpl" 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_e_id`"/>
+		</key>
+		<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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="eenumliteral_eenum" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`eenumliteral_eenum_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EFactoryImpl" 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_e_id`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EOperationImpl" 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_e_id`"/>
+		</key>
+		<many-to-one name="eContainingClass" entity-name="EClass" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="eoperation_econtainingclass" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`eoperation_econtainingclass_e_id`"/>
+		</many-to-one>
+		<list name="eTypeParameters" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eoperation_etypeparameters">
+				<column name="`eoperation_etypeparameters_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eoperation_etypeparameters_idx`"/>
+			<one-to-many entity-name="ETypeParameter"/>
+		</list>
+		<list name="eParameters" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eoperation_eparameters">
+				<column name="`eparameter_eoperation_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eoperation_eparameters_idx`"/>
+			<one-to-many entity-name="EParameter"/>
+		</list>
+		<list name="eExceptions" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="eoperation_eexceptions">
+				<column name="`eoperation_eexceptions_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eoperation_eexceptions_idx`"/>
+			<one-to-many entity-name="EClassifier"/>
+		</list>
+		<list name="eGenericExceptions" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eoperation_egenericexceptions">
+				<column name="`eoperation_egenericexceptions_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eoperation_egenericexceptions_idx`"/>
+			<one-to-many entity-name="EGenericType"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EPackageImpl" 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_e_id`"/>
+		</key>
+		<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" foreign-key="epackage_eclassifiers">
+				<column name="`eclassifier_epackage_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`epackage_eclassifiers_idx`"/>
+			<one-to-many entity-name="EClassifier"/>
+		</list>
+		<list name="eSubpackages" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="epackage_esubpackages">
+				<column name="`epackage_esuperpackage_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`epackage_esubpackages_idx`"/>
+			<one-to-many entity-name="EPackage"/>
+		</list>
+		<many-to-one name="eSuperPackage" entity-name="EPackage" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="epackage_esuperpackage" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`epackage_esuperpackage_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EParameterImpl" 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_e_id`"/>
+		</key>
+		<many-to-one name="eOperation" entity-name="EOperation" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="eparameter_eoperation" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`eparameter_eoperation_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EReferenceImpl" 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_e_id`"/>
+		</key>
+		<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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ereference_eopposite" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ereference_eopposite_e_id`"/>
+		</many-to-one>
+		<list name="eKeys" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="ereference_ekeys">
+				<column name="`ereference_ekeys_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ereference_ekeys_idx`"/>
+			<one-to-many entity-name="EAttribute"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EGenericTypeImpl" entity-name="EGenericType" abstract="false" lazy="false" extends="ecore_EObject" table="`egenerictype`">
+		<meta attribute="eclassName">EGenericType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<key>
+			<column name="`ecore_eobject_e_id`"/>
+		</key>
+		<many-to-one name="eUpperBound" entity-name="EGenericType" lazy="false" cascade="all" foreign-key="egenerictype_eupperbound" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`egenerictype_eupperbound_e_id`"/>
+		</many-to-one>
+		<list name="eTypeArguments" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="egenerictype_etypearguments">
+				<column name="`egenerictype_etypearguments_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`egenerictype_etypearguments_idx`"/>
+			<one-to-many entity-name="EGenericType"/>
+		</list>
+		<many-to-one name="eLowerBound" entity-name="EGenericType" lazy="false" cascade="all" foreign-key="egenerictype_elowerbound" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`egenerictype_elowerbound_e_id`"/>
+		</many-to-one>
+		<many-to-one name="eTypeParameter" entity-name="ETypeParameter" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="egenerictype_etypeparameter" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`etypeparameter_etypeparameter_e_id`"/>
+		</many-to-one>
+		<many-to-one name="eClassifier" entity-name="EClassifier" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="egenerictype_eclassifier" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`eclassifier_eclassifier_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.ETypeParameterImpl" entity-name="ETypeParameter" abstract="false" lazy="false" extends="ENamedElement" table="`etypeparameter`">
+		<meta attribute="eclassName">ETypeParameter</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<key>
+			<column name="`enamedelement_e_id`"/>
+		</key>
+		<list name="eBounds" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="etypeparameter_ebounds">
+				<column name="`etypeparameter_ebounds_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`etypeparameter_ebounds_idx`"/>
+			<one-to-many entity-name="EGenericType"/>
+		</list>
+	</joined-subclass>
+	<class name="org.eclipse.emf.ecore.xml.type.impl.AnyTypeImpl" entity-name="AnyType" abstract="false" lazy="false" table="`anytype`">
+		<meta attribute="eclassName">AnyType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2003/XMLType</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="mixed" table="`anytype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`anytype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`anytype_mixed_idx`"/>
+			<one-to-many entity-name="AnyType_mixed"/>
+		</list>
+		<list name="anyAttribute" table="`anytype_anyattribute`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`anytype_anyattribute_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`anytype_anyattribute_idx`"/>
+			<one-to-many entity-name="AnyType_anyAttribute"/>
+		</list>
+	</class>
+	<class entity-name="AnyType_mixed" lazy="false" table="`anytype_mixed`">
+		<meta attribute="featureMap">AnyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="any" table="`mixed_anytype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_anytype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_anytype_any_idx`"/>
+			<one-to-many entity-name="AnyType_any"/>
+		</list>
+		<list name="anyAttribute" table="`mixed_anytype_anyattribute`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_anytype_anyattribute_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_anytype_anyattribute_idx`"/>
+			<one-to-many entity-name="AnyType_anyAttribute"/>
+		</list>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="AnyType_anyAttribute" lazy="false" table="`anytype_anyattribute`">
+		<meta attribute="featureMap">AnyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+	</class>
+	<class entity-name="AnyType_any" lazy="false" table="`anytype_any`">
+		<meta attribute="featureMap">AnyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.eclipse.emf.ecore.xml.type.impl.ProcessingInstructionImpl" entity-name="ProcessingInstruction" abstract="false" lazy="false" table="`processinginstruction`">
+		<meta attribute="eclassName">ProcessingInstruction</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2003/XMLType</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="data" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`data`"/>
+		</property>
+		<property name="target" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`target`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.ecore.xml.type.impl.SimpleAnyTypeImpl" entity-name="SimpleAnyType" abstract="false" lazy="false" extends="AnyType" table="`simpleanytype`">
+		<meta attribute="eclassName">SimpleAnyType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2003/XMLType</meta>
+		<key>
+			<column name="`anytype_e_id`"/>
+		</key>
+		<many-to-one name="instanceType" entity-name="EDataType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="simpleanytype_instancetype" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`edatatype_instancetype_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EcoreAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EcoreAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f00ce5948
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EcoreAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,583 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<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.EJavaClass" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
+		<param name="edatatype">EJavaClass</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="type.Duration" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">Duration</param>
+	</typedef>
+	<typedef name="type.ENTITIES" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ENTITIES</param>
+	</typedef>
+	<typedef name="type.ENTITIESBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ENTITIESBase</param>
+	</typedef>
+	<typedef name="type.IDREFS" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">IDREFS</param>
+	</typedef>
+	<typedef name="type.IDREFSBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">IDREFSBase</param>
+	</typedef>
+	<typedef name="type.NMTOKENS" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NMTOKENS</param>
+	</typedef>
+	<typedef name="type.NMTOKENSBase" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NMTOKENSBase</param>
+	</typedef>
+	<typedef name="type.NOTATION" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">NOTATION</param>
+	</typedef>
+	<typedef name="type.QName" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">QName</param>
+	</typedef>
+	<typedef name="type.ShortObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">ShortObject</param>
+	</typedef>
+	<typedef name="type.UnsignedByteObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/2003/XMLType</param>
+		<param name="edatatype">UnsignedByteObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.ecore.impl.BasicEObjectImpl" entity-name="ecore_EObject" abstract="false" lazy="false" table="`ecore_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">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EModelElementImpl" entity-name="EModelElement" abstract="true" lazy="false" extends="ecore_EObject" table="`emodelelement`">
+		<meta attribute="eclassName">EModelElement</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<key>
+			<column name="`ecore_eobject_e_id`"/>
+		</key>
+		<list name="eAnnotations" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="emodelelement_eannotations">
+				<column name="`eannotation_emodelelement_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`emodelelement_eannotations_idx`"/>
+			<one-to-many entity-name="EAnnotation"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.ENamedElementImpl" 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_e_id`"/>
+		</key>
+		<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 name="org.eclipse.emf.ecore.impl.ETypedElementImpl" 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_e_id`"/>
+		</key>
+		<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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="etypedelement_etype" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`eclassifier_etype_e_id`"/>
+		</many-to-one>
+		<many-to-one name="eGenericType" entity-name="EGenericType" lazy="false" cascade="all" foreign-key="etypedelement_egenerictype" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`egenerictype_egenerictype_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EStructuralFeatureImpl" 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_e_id`"/>
+		</key>
+		<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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="estructuralfeature_econtainingclass" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`estructuralfeature_econtainingclass_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EAttributeImpl" 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_e_id`"/>
+		</key>
+		<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 name="org.eclipse.emf.ecore.impl.EAnnotationImpl" 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_e_id`"/>
+		</key>
+		<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>
+		<map name="details" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`eannotation_details_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<many-to-one name="eModelElement" entity-name="EModelElement" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="eannotation_emodelelement" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`eannotation_emodelelement_e_id`"/>
+		</many-to-one>
+		<list name="contents" table="`eannotation_contents`" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eannotation_contents">
+				<column name="`eannotation_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`eannotation_contents_idx`"/>
+			<many-to-any id-type="long" meta-type="string">
+				<column not-null="false" unique="false" name="`contents_type`"/>
+				<column not-null="false" unique="false" name="`contents_id`"/>
+			</many-to-any>
+		</list>
+		<list name="references" table="`eannotation_references`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="eannotation_references">
+				<column name="`eannotation_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`eannotation_references_idx`"/>
+			<many-to-any id-type="long" meta-type="string">
+				<column not-null="false" unique="false" name="`references_type`"/>
+				<column not-null="false" unique="false" name="`references_id`"/>
+			</many-to-any>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EClassifierImpl" 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_e_id`"/>
+		</key>
+		<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>
+		<property name="instanceTypeName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`instancetypename`"/>
+		</property>
+		<many-to-one name="ePackage" entity-name="EPackage" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="eclassifier_epackage" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`eclassifier_epackage_e_id`"/>
+		</many-to-one>
+		<list name="eTypeParameters" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eclassifier_etypeparameters">
+				<column name="`eclassifier_etypeparameters_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eclassifier_etypeparameters_idx`"/>
+			<one-to-many entity-name="ETypeParameter"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EClassImpl" 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_e_id`"/>
+		</key>
+		<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" foreign-key="eclass_esupertypes">
+				<column name="`eclass_esupertypes_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eclass_esupertypes_idx`"/>
+			<one-to-many entity-name="EClass"/>
+		</list>
+		<list name="eOperations" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eclass_eoperations">
+				<column name="`eoperation_econtainingclass_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eclass_eoperations_idx`"/>
+			<one-to-many entity-name="EOperation"/>
+		</list>
+		<list name="eStructuralFeatures" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eclass_estructuralfeatures">
+				<column name="`estructuralfeature_econtainingclass_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eclass_estructuralfeatures_idx`"/>
+			<one-to-many entity-name="EStructuralFeature"/>
+		</list>
+		<list name="eGenericSuperTypes" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eclass_egenericsupertypes">
+				<column name="`eclass_egenericsupertypes_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eclass_egenericsupertypes_idx`"/>
+			<one-to-many entity-name="EGenericType"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EDataTypeImpl" 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_e_id`"/>
+		</key>
+		<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 name="org.eclipse.emf.ecore.impl.EEnumImpl" 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_e_id`"/>
+		</key>
+		<list name="eLiterals" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eenum_eliterals">
+				<column name="`eenumliteral_eenum_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eenum_eliterals_idx`"/>
+			<one-to-many entity-name="EEnumLiteral"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EEnumLiteralImpl" 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_e_id`"/>
+		</key>
+		<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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="eenumliteral_eenum" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`eenumliteral_eenum_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EFactoryImpl" 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_e_id`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EOperationImpl" 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_e_id`"/>
+		</key>
+		<many-to-one name="eContainingClass" entity-name="EClass" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="eoperation_econtainingclass" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`eoperation_econtainingclass_e_id`"/>
+		</many-to-one>
+		<list name="eTypeParameters" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eoperation_etypeparameters">
+				<column name="`eoperation_etypeparameters_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eoperation_etypeparameters_idx`"/>
+			<one-to-many entity-name="ETypeParameter"/>
+		</list>
+		<list name="eParameters" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eoperation_eparameters">
+				<column name="`eparameter_eoperation_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eoperation_eparameters_idx`"/>
+			<one-to-many entity-name="EParameter"/>
+		</list>
+		<list name="eExceptions" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="eoperation_eexceptions">
+				<column name="`eoperation_eexceptions_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eoperation_eexceptions_idx`"/>
+			<one-to-many entity-name="EClassifier"/>
+		</list>
+		<list name="eGenericExceptions" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="eoperation_egenericexceptions">
+				<column name="`eoperation_egenericexceptions_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`eoperation_egenericexceptions_idx`"/>
+			<one-to-many entity-name="EGenericType"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EPackageImpl" 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_e_id`"/>
+		</key>
+		<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" foreign-key="epackage_eclassifiers">
+				<column name="`eclassifier_epackage_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`epackage_eclassifiers_idx`"/>
+			<one-to-many entity-name="EClassifier"/>
+		</list>
+		<list name="eSubpackages" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="epackage_esubpackages">
+				<column name="`epackage_esuperpackage_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`epackage_esubpackages_idx`"/>
+			<one-to-many entity-name="EPackage"/>
+		</list>
+		<many-to-one name="eSuperPackage" entity-name="EPackage" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="epackage_esuperpackage" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`epackage_esuperpackage_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EParameterImpl" 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_e_id`"/>
+		</key>
+		<many-to-one name="eOperation" entity-name="EOperation" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="eparameter_eoperation" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`eparameter_eoperation_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EReferenceImpl" 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_e_id`"/>
+		</key>
+		<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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ereference_eopposite" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ereference_eopposite_e_id`"/>
+		</many-to-one>
+		<list name="eKeys" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="ereference_ekeys">
+				<column name="`ereference_ekeys_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ereference_ekeys_idx`"/>
+			<one-to-many entity-name="EAttribute"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.EGenericTypeImpl" entity-name="EGenericType" abstract="false" lazy="false" extends="ecore_EObject" table="`egenerictype`">
+		<meta attribute="eclassName">EGenericType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<key>
+			<column name="`ecore_eobject_e_id`"/>
+		</key>
+		<many-to-one name="eUpperBound" entity-name="EGenericType" lazy="false" cascade="all" foreign-key="egenerictype_eupperbound" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`egenerictype_eupperbound_e_id`"/>
+		</many-to-one>
+		<list name="eTypeArguments" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="egenerictype_etypearguments">
+				<column name="`egenerictype_etypearguments_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`egenerictype_etypearguments_idx`"/>
+			<one-to-many entity-name="EGenericType"/>
+		</list>
+		<many-to-one name="eLowerBound" entity-name="EGenericType" lazy="false" cascade="all" foreign-key="egenerictype_elowerbound" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`egenerictype_elowerbound_e_id`"/>
+		</many-to-one>
+		<many-to-one name="eTypeParameter" entity-name="ETypeParameter" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="egenerictype_etypeparameter" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`etypeparameter_etypeparameter_e_id`"/>
+		</many-to-one>
+		<many-to-one name="eClassifier" entity-name="EClassifier" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="egenerictype_eclassifier" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`eclassifier_eclassifier_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.ecore.impl.ETypeParameterImpl" entity-name="ETypeParameter" abstract="false" lazy="false" extends="ENamedElement" table="`etypeparameter`">
+		<meta attribute="eclassName">ETypeParameter</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2002/Ecore</meta>
+		<key>
+			<column name="`enamedelement_e_id`"/>
+		</key>
+		<list name="eBounds" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="etypeparameter_ebounds">
+				<column name="`etypeparameter_ebounds_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`etypeparameter_ebounds_idx`"/>
+			<one-to-many entity-name="EGenericType"/>
+		</list>
+	</joined-subclass>
+	<class name="org.eclipse.emf.ecore.xml.type.impl.AnyTypeImpl" entity-name="AnyType" abstract="false" lazy="false" table="`anytype`">
+		<meta attribute="eclassName">AnyType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2003/XMLType</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="mixed" table="`anytype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`anytype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`anytype_mixed_idx`"/>
+			<one-to-many entity-name="AnyType_mixed"/>
+		</list>
+		<list name="anyAttribute" table="`anytype_anyattribute`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`anytype_anyattribute_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`anytype_anyattribute_idx`"/>
+			<one-to-many entity-name="AnyType_anyAttribute"/>
+		</list>
+	</class>
+	<class entity-name="AnyType_mixed" lazy="false" table="`anytype_mixed`">
+		<meta attribute="featureMap">AnyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<list name="any" table="`mixed_anytype_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_anytype_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_anytype_any_idx`"/>
+			<one-to-many entity-name="AnyType_any"/>
+		</list>
+		<list name="anyAttribute" table="`mixed_anytype_anyattribute`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_anytype_anyattribute_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_anytype_anyattribute_idx`"/>
+			<one-to-many entity-name="AnyType_anyAttribute"/>
+		</list>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="AnyType_anyAttribute" lazy="false" table="`anytype_anyattribute`">
+		<meta attribute="featureMap">AnyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+	</class>
+	<class entity-name="AnyType_any" lazy="false" table="`anytype_any`">
+		<meta attribute="featureMap">AnyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="any_fme_any_data" type="java.lang.String"/>
+		<any id-type="long" meta-type="string" name="any_fme_any_reference" cascade="all">
+			<column not-null="false" unique="false" name="`any_type`"/>
+			<column not-null="false" unique="false" name="`any_id`"/>
+		</any>
+	</class>
+	<class name="org.eclipse.emf.ecore.xml.type.impl.ProcessingInstructionImpl" entity-name="ProcessingInstruction" abstract="false" lazy="false" table="`processinginstruction`">
+		<meta attribute="eclassName">ProcessingInstruction</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2003/XMLType</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="data" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`data`"/>
+		</property>
+		<property name="target" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`target`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.ecore.xml.type.impl.SimpleAnyTypeImpl" entity-name="SimpleAnyType" abstract="false" lazy="false" extends="AnyType" table="`simpleanytype`">
+		<meta attribute="eclassName">SimpleAnyType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/2003/XMLType</meta>
+		<key>
+			<column name="`anytype_e_id`"/>
+		</key>
+		<many-to-one name="instanceType" entity-name="EDataType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="simpleanytype_instancetype" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`edatatype_instancetype_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EmployeeAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EmployeeAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..afde9f553
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EmployeeAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,65 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.employee.impl.DepartmentImpl" entity-name="Department" abstract="false" lazy="false" discriminator-value="Department" table="`department`">
+		<meta attribute="eclassName">Department</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Employee</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="employees" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="department_employees">
+				<column name="`department_employees_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Employee"/>
+			<filter name="ageRange" condition="age between :fromAge and :toAge"/>
+			<filter name="salaryHigherThan" condition="salary > :salary"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.employee.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" discriminator-value="Employee" table="`employee`">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Employee</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="salary" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`salary`"/>
+		</property>
+		<property name="age" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`age`"/>
+		</property>
+		<property name="hireDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`hiredate`"/>
+		</property>
+		<filter name="ageRange" condition="age between :fromAge and :toAge"/>
+		<filter name="salaryHigherThan" condition="salary > :salary"/>
+		<filter name="hireDate" condition="hireDate > :date"/>
+	</class>
+	<filter-def name="hireDate">
+		<filter-param name="date" type="date"/>
+	</filter-def>
+	<filter-def name="ageRange">
+		<filter-param name="fromAge" type="integer"/>
+		<filter-param name="toAge" type="integer"/>
+	</filter-def>
+	<filter-def name="salaryHigherThan">
+		<filter-param name="salary" type="integer"/>
+	</filter-def>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EmployeeAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EmployeeAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..784f8ed2c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EmployeeAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,63 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.employee.impl.DepartmentImpl" entity-name="Department" abstract="false" lazy="false" table="`department`">
+		<meta attribute="eclassName">Department</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Employee</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="employees" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="department_employees">
+				<column name="`department_employees_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Employee"/>
+			<filter name="ageRange" condition="age between :fromAge and :toAge"/>
+			<filter name="salaryHigherThan" condition="salary > :salary"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.employee.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" table="`employee`">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Employee</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="salary" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`salary`"/>
+		</property>
+		<property name="age" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`age`"/>
+		</property>
+		<property name="hireDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`hiredate`"/>
+		</property>
+		<filter name="ageRange" condition="age between :fromAge and :toAge"/>
+		<filter name="salaryHigherThan" condition="salary > :salary"/>
+		<filter name="hireDate" condition="hireDate > :date"/>
+	</class>
+	<filter-def name="hireDate">
+		<filter-param name="date" type="date"/>
+	</filter-def>
+	<filter-def name="ageRange">
+		<filter-param name="fromAge" type="integer"/>
+		<filter-param name="toAge" type="integer"/>
+	</filter-def>
+	<filter-def name="salaryHigherThan">
+		<filter-param name="salary" type="integer"/>
+	</filter-def>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EmployeeAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EmployeeAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..784f8ed2c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/EmployeeAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,63 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.employee.impl.DepartmentImpl" entity-name="Department" abstract="false" lazy="false" table="`department`">
+		<meta attribute="eclassName">Department</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Employee</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="employees" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="department_employees">
+				<column name="`department_employees_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Employee"/>
+			<filter name="ageRange" condition="age between :fromAge and :toAge"/>
+			<filter name="salaryHigherThan" condition="salary > :salary"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.employee.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" table="`employee`">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Employee</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="salary" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`salary`"/>
+		</property>
+		<property name="age" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`age`"/>
+		</property>
+		<property name="hireDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`hiredate`"/>
+		</property>
+		<filter name="ageRange" condition="age between :fromAge and :toAge"/>
+		<filter name="salaryHigherThan" condition="salary > :salary"/>
+		<filter name="hireDate" condition="hireDate > :date"/>
+	</class>
+	<filter-def name="hireDate">
+		<filter-param name="date" type="date"/>
+	</filter-def>
+	<filter-def name="ageRange">
+		<filter-param name="fromAge" type="integer"/>
+		<filter-param name="toAge" type="integer"/>
+	</filter-def>
+	<filter-def name="salaryHigherThan">
+		<filter-param name="salary" type="integer"/>
+	</filter-def>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/FleetAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/FleetAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..804fa4e0b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/FleetAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,425 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class entity-name="Vehicle" abstract="false" lazy="false" discriminator-value="Vehicle" table="`vehicle`">
+		<meta attribute="eclassName">Vehicle</meta>
+		<meta attribute="epackage">http:///fleet.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 type="string">
+			<column name="dtype" index="vehicledtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="brand" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`brand`"/>
+		</property>
+		<property name="model" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`model`"/>
+		</property>
+		<property name="make" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`make`"/>
+		</property>
+		<property name="color" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`color`"/>
+		</property>
+		<property name="plate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`plate`"/>
+		</property>
+		<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>
+		<property name="year" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`year`"/>
+		</property>
+		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`length`"/>
+		</property>
+		<list name="availableColors" table="`vehicle_availablecolors`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`vehicle_availablecolors_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`vehicle_availablecolors_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+		<many-to-one name="owner" entity-name="Person" lazy="false" cascade="all" foreign-key="vehicle_owner" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`person_owner_e_id`"/>
+		</many-to-one>
+		<list name="manufacturedAt" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="vehicle_manufacturedat">
+				<column name="`vehicle_manufacturedat_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`vehicle_manufacturedat_idx`"/>
+			<one-to-many entity-name="ManufacturingPlant"/>
+		</list>
+		<many-to-one name="tireSpec" entity-name="Tire" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vehicle_tirespec" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`tire_tirespec_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="Temporal" abstract="false" lazy="false" discriminator-value="Temporal" table="`temporal`">
+		<meta attribute="eclassName">Temporal</meta>
+		<meta attribute="epackage">http:///temporal.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 type="string">
+			<column name="dtype" index="temporaldtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`date`"/>
+		</property>
+		<array name="touchedAttributes" table="`temporal_touchedattributes`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`temporal_touchedattributes_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`temporal_touchedattributes_idx`"/>
+			<element type="byte"/>
+		</array>
+		<property name="continuity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`continuity`"/>
+		</property>
+		<many-to-one name="versionHolder" entity-name="VersionHolder" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="temporal_versionholder" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`temporal_versionholder_e_id`"/>
+		</many-to-one>
+		<many-to-one name="versionHolderContainment" entity-name="VersionHolder" lazy="false" cascade="all" foreign-key="temporal_versionholdercontainment" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`versionholder_versionholdercontainment_e_id`"/>
+		</many-to-one>
+	</class>
+	<subclass entity-name="Person" abstract="false" lazy="false" extends="Temporal" discriminator-value="Person">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http:///fleet.ecore</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>
+		<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="employed" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`employed`"/>
+		</property>
+		<list name="addresses" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="person_addresses">
+				<column name="`person_addresses_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_addresses_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="ownedVehicles" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="person_ownedvehicles">
+				<column name="`person_ownedvehicles_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_ownedvehicles_idx`"/>
+			<one-to-many entity-name="VehicleInfo"/>
+		</list>
+		<many-to-one name="birthAddress" entity-name="Address" lazy="false" cascade="all" foreign-key="person_birthaddress" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_birthaddress_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass entity-name="Address" abstract="false" lazy="false" extends="Temporal" discriminator-value="Address">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http:///fleet.ecore</meta>
+		<property name="streetName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`streetname`"/>
+		</property>
+		<property name="streetNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`streetnumber`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`city`"/>
+		</property>
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`country`"/>
+		</property>
+	</subclass>
+	<class entity-name="VehicleInfo" abstract="false" lazy="false" discriminator-value="VehicleInfo" table="`vehicleinfo`">
+		<meta attribute="eclassName">VehicleInfo</meta>
+		<meta attribute="epackage">http:///fleet.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 type="string">
+			<column name="dtype" index="vehicleinfodtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="acquisitionDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`acquisitiondate`"/>
+		</property>
+		<many-to-one name="vehicle" entity-name="Vehicle" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vehicleinfo_vehicle" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`vehicle_vehicle_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="ManufacturingPlant" abstract="false" lazy="false" discriminator-value="ManufacturingPlant" table="`manufacturingplant`">
+		<meta attribute="eclassName">ManufacturingPlant</meta>
+		<meta attribute="epackage">http:///fleet.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 type="string">
+			<column name="dtype" index="manufacturingplantdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`id`"/>
+		</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>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="manufacturingplant_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<many-to-one name="transportFleet" entity-name="Fleet" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="manufacturingplant_transportfleet" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`fleet_transportfleet_e_id`"/>
+		</many-to-one>
+	</class>
+	<subclass entity-name="Fleet" abstract="false" lazy="false" extends="Temporal" discriminator-value="Fleet">
+		<meta attribute="eclassName">Fleet</meta>
+		<meta attribute="epackage">http:///fleet.ecore</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>
+		<list name="vehicles" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="fleet_vehicles">
+				<column name="`fleet_vehicles_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`fleet_vehicles_idx`"/>
+			<one-to-many entity-name="Vehicle"/>
+		</list>
+		<list name="vehicleInformation" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="fleet_vehicleinformation">
+				<column name="`fleet_vehicleinformation_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`fleet_vehicleinformation_idx`"/>
+			<one-to-many entity-name="VehicleInfo"/>
+		</list>
+		<many-to-one name="serviceGarage" entity-name="Garage" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="fleet_servicegarage" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`fleet_servicegarage_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass entity-name="Garage" abstract="false" lazy="false" extends="Temporal" discriminator-value="Garage">
+		<meta attribute="eclassName">Garage</meta>
+		<meta attribute="epackage">http:///fleet.ecore</meta>
+		<list name="vehicles" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="garage_vehicles">
+				<column name="`garage_vehicles_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`garage_vehicles_idx`"/>
+			<one-to-many entity-name="Vehicle"/>
+		</list>
+		<many-to-one name="customerShuttles" entity-name="Fleet" lazy="false" cascade="all" foreign-key="garage_customershuttles" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`fleet_customershuttles_e_id`"/>
+		</many-to-one>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="garage_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<list name="fleetsUsingGarage" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`fleet_servicegarage_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`garage_fleetsusinggarage_idx`"/>
+			<one-to-many entity-name="Fleet"/>
+		</list>
+		<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>
+	<class entity-name="Tire" abstract="false" lazy="false" discriminator-value="Tire" table="`tire`">
+		<meta attribute="eclassName">Tire</meta>
+		<meta attribute="epackage">http:///fleet.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 type="string">
+			<column name="dtype" index="tiredtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="radius" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`radius`"/>
+		</property>
+		<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="profile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`profile`"/>
+		</property>
+		<property name="make" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`make`"/>
+		</property>
+		<property name="model" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`model`"/>
+		</property>
+	</class>
+	<subclass entity-name="Car" abstract="false" lazy="false" extends="Vehicle" discriminator-value="Car">
+		<meta attribute="eclassName">Car</meta>
+		<meta attribute="epackage">http:///fleet.ecore</meta>
+		<property name="passengerName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`passengername`"/>
+		</property>
+		<property name="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`date`"/>
+		</property>
+		<array name="touchedAttributes" table="`car_touchedattributes`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`car_touchedattributes_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`car_touchedattributes_idx`"/>
+			<element type="byte"/>
+		</array>
+		<property name="continuity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`continuity`"/>
+		</property>
+		<many-to-one name="versionHolder" entity-name="VersionHolder" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="temporal_versionholder" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`car_versionholder_e_id`"/>
+		</many-to-one>
+		<many-to-one name="versionHolderContainment" entity-name="VersionHolder" lazy="false" cascade="all" foreign-key="temporal_versionholdercontainment" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`versionholder_versionholdercontainment_e_id`"/>
+		</many-to-one>
+		<property name="numPassengers" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`numpassengers`"/>
+		</property>
+		<property name="numTires" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`numtires`"/>
+		</property>
+		<list name="tires" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="car_tires">
+				<column name="`car_tires_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`car_tires_idx`"/>
+			<one-to-many entity-name="Tire"/>
+		</list>
+	</subclass>
+	<subclass entity-name="Hybrid" abstract="false" lazy="false" extends="Car" discriminator-value="Hybrid">
+		<meta attribute="eclassName">Hybrid</meta>
+		<meta attribute="epackage">http:///fleet.ecore</meta>
+		<property name="hasRechargePlug" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`hasrechargeplug`"/>
+		</property>
+		<property name="batteryLife" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`batterylife`"/>
+		</property>
+	</subclass>
+	<class name="fleet.PassengerVehicle" entity-name="PassengerVehicle" abstract="true" lazy="false" discriminator-value="PassengerVehicle" table="`passengervehicle`">
+		<meta attribute="eclassName">PassengerVehicle</meta>
+		<meta attribute="epackage">http:///fleet.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 type="string">
+			<column name="dtype" index="passengervehicledtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="passengerName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`passengername`"/>
+		</property>
+	</class>
+	<subclass entity-name="EngineFactory" abstract="false" lazy="false" extends="ManufacturingPlant" discriminator-value="EngineFactory">
+		<meta attribute="eclassName">EngineFactory</meta>
+		<meta attribute="epackage">http:///fleet.ecore</meta>
+		<property name="makesDieselEngines" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`makesdieselengines`"/>
+		</property>
+		<list name="brands" table="`enginefactory_brands`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`enginefactory_brands_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`enginefactory_brands_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</subclass>
+	<subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http:///fleet.ecore</meta>
+		<property name="zipCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`zipcode`"/>
+		</property>
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`state`"/>
+		</property>
+	</subclass>
+	<class entity-name="Vin" abstract="false" lazy="false" discriminator-value="Vin" table="`vin`">
+		<meta attribute="eclassName">Vin</meta>
+		<meta attribute="epackage">http:///fleet.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 type="string">
+			<column name="dtype" index="vindtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`id`"/>
+		</property>
+		<property name="installationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`installationdate`"/>
+		</property>
+		<many-to-one name="vehicle" entity-name="Vehicle" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vin_vehicle" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`vehicle_vehicle_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="TransportationDevice" abstract="false" lazy="false" discriminator-value="TransportationDevice" table="`transportationdevice`">
+		<meta attribute="eclassName">TransportationDevice</meta>
+		<meta attribute="epackage">http:///fleet.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 type="string">
+			<column name="dtype" index="transportationdevicedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="manufacturedBy" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`manufacturedby`"/>
+		</property>
+		<property name="year" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`year`"/>
+		</property>
+	</class>
+	<class entity-name="VersionHolder" abstract="false" lazy="false" discriminator-value="VersionHolder" table="`versionholder`">
+		<meta attribute="eclassName">VersionHolder</meta>
+		<meta attribute="epackage">http:///temporal.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 type="string">
+			<column name="dtype" index="versionholderdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="versions" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`temporal_versionholder_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`versionholder_versions_idx`"/>
+			<one-to-many entity-name="Temporal"/>
+		</list>
+		<property name="indexOfContinuity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`indexofcontinuity`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/FleetAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/FleetAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..16885c2d9
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/FleetAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,422 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class entity-name="Vehicle" abstract="false" lazy="false" table="`vehicle`">
+		<meta attribute="eclassName" inherit="false">Vehicle</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="brand" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`brand`"/>
+		</property>
+		<property name="model" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`model`"/>
+		</property>
+		<property name="make" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`make`"/>
+		</property>
+		<property name="color" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`color`"/>
+		</property>
+		<property name="plate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`plate`"/>
+		</property>
+		<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>
+		<property name="year" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`year`"/>
+		</property>
+		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`length`"/>
+		</property>
+		<list name="availableColors" table="`vehicle_availablecolors`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`vehicle_availablecolors_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`vehicle_availablecolors_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+		<many-to-one name="owner" entity-name="Person" lazy="false" cascade="all" foreign-key="vehicle_owner" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`person_owner_e_id`"/>
+		</many-to-one>
+		<list name="manufacturedAt" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="vehicle_manufacturedat">
+				<column name="`vehicle_manufacturedat_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`vehicle_manufacturedat_idx`"/>
+			<one-to-many entity-name="ManufacturingPlant"/>
+		</list>
+		<many-to-one name="tireSpec" entity-name="Tire" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vehicle_tirespec" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`tire_tirespec_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="Temporal" abstract="false" lazy="false" table="`temporal`">
+		<meta attribute="eclassName" inherit="false">Temporal</meta>
+		<meta attribute="epackage" inherit="false">http:///temporal.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`date`"/>
+		</property>
+		<array name="touchedAttributes" table="`temporal_touchedattributes`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`temporal_touchedattributes_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`temporal_touchedattributes_idx`"/>
+			<element type="byte"/>
+		</array>
+		<property name="continuity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`continuity`"/>
+		</property>
+		<many-to-one name="versionHolder" entity-name="VersionHolder" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="temporal_versionholder" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`temporal_versionholder_e_id`"/>
+		</many-to-one>
+		<many-to-one name="versionHolderContainment" entity-name="VersionHolder" lazy="false" cascade="all" foreign-key="temporal_versionholdercontainment" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`versionholder_versionholdercontainment_e_id`"/>
+		</many-to-one>
+	</class>
+	<joined-subclass entity-name="Person" abstract="false" lazy="false" extends="Temporal" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`temporal_e_id`"/>
+		</key>
+		<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>
+		<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="employed" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`employed`"/>
+		</property>
+		<list name="addresses" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="person_addresses">
+				<column name="`person_addresses_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_addresses_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="ownedVehicles" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="person_ownedvehicles">
+				<column name="`person_ownedvehicles_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_ownedvehicles_idx`"/>
+			<one-to-many entity-name="VehicleInfo"/>
+		</list>
+		<many-to-one name="birthAddress" entity-name="Address" lazy="false" cascade="all" foreign-key="person_birthaddress" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_birthaddress_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="Address" abstract="false" lazy="false" extends="Temporal" table="`address`">
+		<meta attribute="eclassName" inherit="false">Address</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`temporal_e_id`"/>
+		</key>
+		<property name="streetName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`streetname`"/>
+		</property>
+		<property name="streetNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`streetnumber`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`city`"/>
+		</property>
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`country`"/>
+		</property>
+	</joined-subclass>
+	<class entity-name="VehicleInfo" abstract="false" lazy="false" table="`vehicleinfo`">
+		<meta attribute="eclassName" inherit="false">VehicleInfo</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="acquisitionDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`acquisitiondate`"/>
+		</property>
+		<many-to-one name="vehicle" entity-name="Vehicle" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vehicleinfo_vehicle" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`vehicle_vehicle_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="ManufacturingPlant" abstract="false" lazy="false" table="`manufacturingplant`">
+		<meta attribute="eclassName" inherit="false">ManufacturingPlant</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<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>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="manufacturingplant_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<many-to-one name="transportFleet" entity-name="Fleet" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="manufacturingplant_transportfleet" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`fleet_transportfleet_e_id`"/>
+		</many-to-one>
+	</class>
+	<joined-subclass entity-name="Fleet" abstract="false" lazy="false" extends="Temporal" table="`fleet`">
+		<meta attribute="eclassName" inherit="false">Fleet</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`temporal_e_id`"/>
+		</key>
+		<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>
+		<list name="vehicles" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="fleet_vehicles">
+				<column name="`fleet_vehicles_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`fleet_vehicles_idx`"/>
+			<one-to-many entity-name="Vehicle"/>
+		</list>
+		<list name="vehicleInformation" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="fleet_vehicleinformation">
+				<column name="`fleet_vehicleinformation_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`fleet_vehicleinformation_idx`"/>
+			<one-to-many entity-name="VehicleInfo"/>
+		</list>
+		<many-to-one name="serviceGarage" entity-name="Garage" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="fleet_servicegarage" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`fleet_servicegarage_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="Garage" abstract="false" lazy="false" extends="Temporal" table="`garage`">
+		<meta attribute="eclassName" inherit="false">Garage</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`temporal_e_id`"/>
+		</key>
+		<list name="vehicles" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="garage_vehicles">
+				<column name="`garage_vehicles_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`garage_vehicles_idx`"/>
+			<one-to-many entity-name="Vehicle"/>
+		</list>
+		<many-to-one name="customerShuttles" entity-name="Fleet" lazy="false" cascade="all" foreign-key="garage_customershuttles" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`fleet_customershuttles_e_id`"/>
+		</many-to-one>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="garage_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<list name="fleetsUsingGarage" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`fleet_servicegarage_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`garage_fleetsusinggarage_idx`"/>
+			<one-to-many entity-name="Fleet"/>
+		</list>
+		<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>
+	<class entity-name="Tire" abstract="false" lazy="false" table="`tire`">
+		<meta attribute="eclassName" inherit="false">Tire</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="radius" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`radius`"/>
+		</property>
+		<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="profile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`profile`"/>
+		</property>
+		<property name="make" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`make`"/>
+		</property>
+		<property name="model" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`model`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="Car" abstract="false" lazy="false" extends="Vehicle" table="`car`">
+		<meta attribute="eclassName" inherit="false">Car</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`passengervehicle_e_id`"/>
+		</key>
+		<property name="passengerName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`passengername`"/>
+		</property>
+		<property name="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`date`"/>
+		</property>
+		<array name="touchedAttributes" table="`car_touchedattributes`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`car_touchedattributes_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`car_touchedattributes_idx`"/>
+			<element type="byte"/>
+		</array>
+		<property name="continuity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`continuity`"/>
+		</property>
+		<many-to-one name="versionHolder" entity-name="VersionHolder" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="temporal_versionholder" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`car_versionholder_e_id`"/>
+		</many-to-one>
+		<many-to-one name="versionHolderContainment" entity-name="VersionHolder" lazy="false" cascade="all" foreign-key="temporal_versionholdercontainment" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`versionholder_versionholdercontainment_e_id`"/>
+		</many-to-one>
+		<property name="numPassengers" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`numpassengers`"/>
+		</property>
+		<property name="numTires" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`numtires`"/>
+		</property>
+		<list name="tires" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="car_tires">
+				<column name="`car_tires_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`car_tires_idx`"/>
+			<one-to-many entity-name="Tire"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass entity-name="Hybrid" abstract="false" lazy="false" extends="Car" table="`hybrid`">
+		<meta attribute="eclassName" inherit="false">Hybrid</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`car_e_id`"/>
+		</key>
+		<property name="hasRechargePlug" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`hasrechargeplug`"/>
+		</property>
+		<property name="batteryLife" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`batterylife`"/>
+		</property>
+	</joined-subclass>
+	<class name="fleet.PassengerVehicle" entity-name="PassengerVehicle" abstract="true" lazy="false" table="`passengervehicle`">
+		<meta attribute="eclassName" inherit="false">PassengerVehicle</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="passengerName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`passengername`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="EngineFactory" abstract="false" lazy="false" extends="ManufacturingPlant" table="`enginefactory`">
+		<meta attribute="eclassName" inherit="false">EngineFactory</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`manufacturingplant_e_id`"/>
+		</key>
+		<property name="makesDieselEngines" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`makesdieselengines`"/>
+		</property>
+		<list name="brands" table="`enginefactory_brands`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`enginefactory_brands_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`enginefactory_brands_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`">
+		<meta attribute="eclassName" inherit="false">USAddress</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="zipCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`zipcode`"/>
+		</property>
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`state`"/>
+		</property>
+	</joined-subclass>
+	<class entity-name="Vin" abstract="false" lazy="false" table="`vin`">
+		<meta attribute="eclassName" inherit="false">Vin</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<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>
+		<property name="installationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`installationdate`"/>
+		</property>
+		<many-to-one name="vehicle" entity-name="Vehicle" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vin_vehicle" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`vehicle_vehicle_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="TransportationDevice" abstract="false" lazy="false" table="`transportationdevice`">
+		<meta attribute="eclassName" inherit="false">TransportationDevice</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="manufacturedBy" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`manufacturedby`"/>
+		</property>
+		<property name="year" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`year`"/>
+		</property>
+	</class>
+	<class entity-name="VersionHolder" abstract="false" lazy="false" table="`versionholder`">
+		<meta attribute="eclassName" inherit="false">VersionHolder</meta>
+		<meta attribute="epackage" inherit="false">http:///temporal.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="versions" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`temporal_versionholder_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`versionholder_versions_idx`"/>
+			<one-to-many entity-name="Temporal"/>
+		</list>
+		<property name="indexOfContinuity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`indexofcontinuity`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/FleetAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/FleetAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..16885c2d9
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/FleetAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,422 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class entity-name="Vehicle" abstract="false" lazy="false" table="`vehicle`">
+		<meta attribute="eclassName" inherit="false">Vehicle</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="brand" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`brand`"/>
+		</property>
+		<property name="model" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`model`"/>
+		</property>
+		<property name="make" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`make`"/>
+		</property>
+		<property name="color" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`color`"/>
+		</property>
+		<property name="plate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`plate`"/>
+		</property>
+		<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>
+		<property name="year" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`year`"/>
+		</property>
+		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`length`"/>
+		</property>
+		<list name="availableColors" table="`vehicle_availablecolors`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`vehicle_availablecolors_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`vehicle_availablecolors_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+		<many-to-one name="owner" entity-name="Person" lazy="false" cascade="all" foreign-key="vehicle_owner" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`person_owner_e_id`"/>
+		</many-to-one>
+		<list name="manufacturedAt" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="vehicle_manufacturedat">
+				<column name="`vehicle_manufacturedat_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`vehicle_manufacturedat_idx`"/>
+			<one-to-many entity-name="ManufacturingPlant"/>
+		</list>
+		<many-to-one name="tireSpec" entity-name="Tire" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vehicle_tirespec" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`tire_tirespec_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="Temporal" abstract="false" lazy="false" table="`temporal`">
+		<meta attribute="eclassName" inherit="false">Temporal</meta>
+		<meta attribute="epackage" inherit="false">http:///temporal.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`date`"/>
+		</property>
+		<array name="touchedAttributes" table="`temporal_touchedattributes`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`temporal_touchedattributes_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`temporal_touchedattributes_idx`"/>
+			<element type="byte"/>
+		</array>
+		<property name="continuity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`continuity`"/>
+		</property>
+		<many-to-one name="versionHolder" entity-name="VersionHolder" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="temporal_versionholder" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`temporal_versionholder_e_id`"/>
+		</many-to-one>
+		<many-to-one name="versionHolderContainment" entity-name="VersionHolder" lazy="false" cascade="all" foreign-key="temporal_versionholdercontainment" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`versionholder_versionholdercontainment_e_id`"/>
+		</many-to-one>
+	</class>
+	<joined-subclass entity-name="Person" abstract="false" lazy="false" extends="Temporal" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`temporal_e_id`"/>
+		</key>
+		<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>
+		<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="employed" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`employed`"/>
+		</property>
+		<list name="addresses" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="person_addresses">
+				<column name="`person_addresses_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_addresses_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="ownedVehicles" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="person_ownedvehicles">
+				<column name="`person_ownedvehicles_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_ownedvehicles_idx`"/>
+			<one-to-many entity-name="VehicleInfo"/>
+		</list>
+		<many-to-one name="birthAddress" entity-name="Address" lazy="false" cascade="all" foreign-key="person_birthaddress" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_birthaddress_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="Address" abstract="false" lazy="false" extends="Temporal" table="`address`">
+		<meta attribute="eclassName" inherit="false">Address</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`temporal_e_id`"/>
+		</key>
+		<property name="streetName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`streetname`"/>
+		</property>
+		<property name="streetNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`streetnumber`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`city`"/>
+		</property>
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`country`"/>
+		</property>
+	</joined-subclass>
+	<class entity-name="VehicleInfo" abstract="false" lazy="false" table="`vehicleinfo`">
+		<meta attribute="eclassName" inherit="false">VehicleInfo</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="acquisitionDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`acquisitiondate`"/>
+		</property>
+		<many-to-one name="vehicle" entity-name="Vehicle" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vehicleinfo_vehicle" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`vehicle_vehicle_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="ManufacturingPlant" abstract="false" lazy="false" table="`manufacturingplant`">
+		<meta attribute="eclassName" inherit="false">ManufacturingPlant</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<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>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="manufacturingplant_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<many-to-one name="transportFleet" entity-name="Fleet" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="manufacturingplant_transportfleet" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`fleet_transportfleet_e_id`"/>
+		</many-to-one>
+	</class>
+	<joined-subclass entity-name="Fleet" abstract="false" lazy="false" extends="Temporal" table="`fleet`">
+		<meta attribute="eclassName" inherit="false">Fleet</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`temporal_e_id`"/>
+		</key>
+		<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>
+		<list name="vehicles" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="fleet_vehicles">
+				<column name="`fleet_vehicles_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`fleet_vehicles_idx`"/>
+			<one-to-many entity-name="Vehicle"/>
+		</list>
+		<list name="vehicleInformation" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="fleet_vehicleinformation">
+				<column name="`fleet_vehicleinformation_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`fleet_vehicleinformation_idx`"/>
+			<one-to-many entity-name="VehicleInfo"/>
+		</list>
+		<many-to-one name="serviceGarage" entity-name="Garage" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="fleet_servicegarage" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`fleet_servicegarage_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="Garage" abstract="false" lazy="false" extends="Temporal" table="`garage`">
+		<meta attribute="eclassName" inherit="false">Garage</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`temporal_e_id`"/>
+		</key>
+		<list name="vehicles" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="garage_vehicles">
+				<column name="`garage_vehicles_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`garage_vehicles_idx`"/>
+			<one-to-many entity-name="Vehicle"/>
+		</list>
+		<many-to-one name="customerShuttles" entity-name="Fleet" lazy="false" cascade="all" foreign-key="garage_customershuttles" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`fleet_customershuttles_e_id`"/>
+		</many-to-one>
+		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="garage_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_e_id`"/>
+		</many-to-one>
+		<list name="fleetsUsingGarage" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`fleet_servicegarage_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`garage_fleetsusinggarage_idx`"/>
+			<one-to-many entity-name="Fleet"/>
+		</list>
+		<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>
+	<class entity-name="Tire" abstract="false" lazy="false" table="`tire`">
+		<meta attribute="eclassName" inherit="false">Tire</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="radius" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`radius`"/>
+		</property>
+		<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="profile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`profile`"/>
+		</property>
+		<property name="make" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`make`"/>
+		</property>
+		<property name="model" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`model`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="Car" abstract="false" lazy="false" extends="Vehicle" table="`car`">
+		<meta attribute="eclassName" inherit="false">Car</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`passengervehicle_e_id`"/>
+		</key>
+		<property name="passengerName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`passengername`"/>
+		</property>
+		<property name="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`date`"/>
+		</property>
+		<array name="touchedAttributes" table="`car_touchedattributes`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`car_touchedattributes_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`car_touchedattributes_idx`"/>
+			<element type="byte"/>
+		</array>
+		<property name="continuity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`continuity`"/>
+		</property>
+		<many-to-one name="versionHolder" entity-name="VersionHolder" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="temporal_versionholder" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`car_versionholder_e_id`"/>
+		</many-to-one>
+		<many-to-one name="versionHolderContainment" entity-name="VersionHolder" lazy="false" cascade="all" foreign-key="temporal_versionholdercontainment" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`versionholder_versionholdercontainment_e_id`"/>
+		</many-to-one>
+		<property name="numPassengers" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`numpassengers`"/>
+		</property>
+		<property name="numTires" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`numtires`"/>
+		</property>
+		<list name="tires" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="car_tires">
+				<column name="`car_tires_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`car_tires_idx`"/>
+			<one-to-many entity-name="Tire"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass entity-name="Hybrid" abstract="false" lazy="false" extends="Car" table="`hybrid`">
+		<meta attribute="eclassName" inherit="false">Hybrid</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`car_e_id`"/>
+		</key>
+		<property name="hasRechargePlug" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`hasrechargeplug`"/>
+		</property>
+		<property name="batteryLife" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`batterylife`"/>
+		</property>
+	</joined-subclass>
+	<class name="fleet.PassengerVehicle" entity-name="PassengerVehicle" abstract="true" lazy="false" table="`passengervehicle`">
+		<meta attribute="eclassName" inherit="false">PassengerVehicle</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="passengerName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`passengername`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="EngineFactory" abstract="false" lazy="false" extends="ManufacturingPlant" table="`enginefactory`">
+		<meta attribute="eclassName" inherit="false">EngineFactory</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`manufacturingplant_e_id`"/>
+		</key>
+		<property name="makesDieselEngines" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`makesdieselengines`"/>
+		</property>
+		<list name="brands" table="`enginefactory_brands`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`enginefactory_brands_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`enginefactory_brands_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`">
+		<meta attribute="eclassName" inherit="false">USAddress</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="zipCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`zipcode`"/>
+		</property>
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`state`"/>
+		</property>
+	</joined-subclass>
+	<class entity-name="Vin" abstract="false" lazy="false" table="`vin`">
+		<meta attribute="eclassName" inherit="false">Vin</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<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>
+		<property name="installationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`installationdate`"/>
+		</property>
+		<many-to-one name="vehicle" entity-name="Vehicle" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vin_vehicle" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`vehicle_vehicle_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="TransportationDevice" abstract="false" lazy="false" table="`transportationdevice`">
+		<meta attribute="eclassName" inherit="false">TransportationDevice</meta>
+		<meta attribute="epackage" inherit="false">http:///fleet.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="manufacturedBy" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`manufacturedby`"/>
+		</property>
+		<property name="year" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`year`"/>
+		</property>
+	</class>
+	<class entity-name="VersionHolder" abstract="false" lazy="false" table="`versionholder`">
+		<meta attribute="eclassName" inherit="false">VersionHolder</meta>
+		<meta attribute="epackage" inherit="false">http:///temporal.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="versions" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`temporal_versionholder_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`versionholder_versions_idx`"/>
+			<one-to-many entity-name="Temporal"/>
+		</list>
+		<property name="indexOfContinuity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`indexofcontinuity`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ForumAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ForumAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ad0610123
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ForumAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,129 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="forum.TopicCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</param>
+		<param name="edatatype">TopicCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.ForumImpl" entity-name="Forum" abstract="false" lazy="false" discriminator-value="Forum" table="`forum`">
+		<meta attribute="eclassName">Forum</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</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 type="string">
+			<column name="dtype" index="forumdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<list name="members" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="forum_members">
+				<column name="`forum_members_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`forum_members_idx`"/>
+			<one-to-many entity-name="Member"/>
+		</list>
+		<list name="topics" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="forum_topics">
+				<column name="`forum_topics_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`forum_topics_idx`"/>
+			<one-to-many entity-name="Topic"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.MemberImpl" entity-name="Member" abstract="false" lazy="false" discriminator-value="Member" table="`member`">
+		<meta attribute="eclassName">Member</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</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 type="string">
+			<column name="dtype" index="memberdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="nickname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`nickname`"/>
+		</property>
+		<list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`post_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`member_posts_idx`"/>
+			<one-to-many entity-name="Post"/>
+		</list>
+		<list name="created" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`topic_creator_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`member_created_idx`"/>
+			<one-to-many entity-name="Topic"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.PostImpl" entity-name="Post" abstract="false" lazy="false" discriminator-value="Post" table="`post`">
+		<meta attribute="eclassName">Post</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</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 type="string">
+			<column name="dtype" index="postdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`comment`"/>
+		</property>
+		<many-to-one name="author" entity-name="Member" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="post_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`post_author_e_id`"/>
+		</many-to-one>
+		<many-to-one name="topic" entity-name="Topic" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="post_topic" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`post_topic_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.TopicImpl" entity-name="Topic" abstract="false" lazy="false" discriminator-value="Topic" table="`topic`">
+		<meta attribute="eclassName">Topic</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</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 type="string">
+			<column name="dtype" index="topicdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.forum.TopicCategory</param>
+				<param name="eclassifier">TopicCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</param>
+			</type>
+		</property>
+		<many-to-one name="creator" entity-name="Member" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="topic_creator" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`topic_creator_e_id`"/>
+		</many-to-one>
+		<list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`post_topic_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`topic_posts_idx`"/>
+			<one-to-many entity-name="Post"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ForumAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ForumAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..271c9eba8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ForumAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,117 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="forum.TopicCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</param>
+		<param name="edatatype">TopicCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.ForumImpl" entity-name="Forum" abstract="false" lazy="false" table="`forum`">
+		<meta attribute="eclassName" inherit="false">Forum</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<list name="members" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="forum_members">
+				<column name="`forum_members_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`forum_members_idx`"/>
+			<one-to-many entity-name="Member"/>
+		</list>
+		<list name="topics" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="forum_topics">
+				<column name="`forum_topics_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`forum_topics_idx`"/>
+			<one-to-many entity-name="Topic"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.MemberImpl" entity-name="Member" abstract="false" lazy="false" table="`member`">
+		<meta attribute="eclassName" inherit="false">Member</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="nickname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`nickname`"/>
+		</property>
+		<list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`post_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`member_posts_idx`"/>
+			<one-to-many entity-name="Post"/>
+		</list>
+		<list name="created" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`topic_creator_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`member_created_idx`"/>
+			<one-to-many entity-name="Topic"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.PostImpl" entity-name="Post" abstract="false" lazy="false" table="`post`">
+		<meta attribute="eclassName" inherit="false">Post</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`comment`"/>
+		</property>
+		<many-to-one name="author" entity-name="Member" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="post_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`post_author_e_id`"/>
+		</many-to-one>
+		<many-to-one name="topic" entity-name="Topic" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="post_topic" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`post_topic_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.TopicImpl" entity-name="Topic" abstract="false" lazy="false" table="`topic`">
+		<meta attribute="eclassName" inherit="false">Topic</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.forum.TopicCategory</param>
+				<param name="eclassifier">TopicCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</param>
+			</type>
+		</property>
+		<many-to-one name="creator" entity-name="Member" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="topic_creator" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`topic_creator_e_id`"/>
+		</many-to-one>
+		<list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`post_topic_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`topic_posts_idx`"/>
+			<one-to-many entity-name="Post"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ForumAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ForumAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..271c9eba8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ForumAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,117 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="forum.TopicCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</param>
+		<param name="edatatype">TopicCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.ForumImpl" entity-name="Forum" abstract="false" lazy="false" table="`forum`">
+		<meta attribute="eclassName" inherit="false">Forum</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<list name="members" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="forum_members">
+				<column name="`forum_members_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`forum_members_idx`"/>
+			<one-to-many entity-name="Member"/>
+		</list>
+		<list name="topics" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="forum_topics">
+				<column name="`forum_topics_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`forum_topics_idx`"/>
+			<one-to-many entity-name="Topic"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.MemberImpl" entity-name="Member" abstract="false" lazy="false" table="`member`">
+		<meta attribute="eclassName" inherit="false">Member</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="nickname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`nickname`"/>
+		</property>
+		<list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`post_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`member_posts_idx`"/>
+			<one-to-many entity-name="Post"/>
+		</list>
+		<list name="created" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`topic_creator_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`member_created_idx`"/>
+			<one-to-many entity-name="Topic"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.PostImpl" entity-name="Post" abstract="false" lazy="false" table="`post`">
+		<meta attribute="eclassName" inherit="false">Post</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`comment`"/>
+		</property>
+		<many-to-one name="author" entity-name="Member" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="post_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`post_author_e_id`"/>
+		</many-to-one>
+		<many-to-one name="topic" entity-name="Topic" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="post_topic" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`post_topic_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.forum.impl.TopicImpl" entity-name="Topic" abstract="false" lazy="false" table="`topic`">
+		<meta attribute="eclassName" inherit="false">Topic</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.forum.TopicCategory</param>
+				<param name="eclassifier">TopicCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/forum</param>
+			</type>
+		</property>
+		<many-to-one name="creator" entity-name="Member" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="topic_creator" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`topic_creator_e_id`"/>
+		</many-to-one>
+		<list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`post_topic_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`topic_posts_idx`"/>
+			<one-to-many entity-name="Post"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/InventoryAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/InventoryAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..01a2281d1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/InventoryAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,60 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl" entity-name="PType" abstract="false" lazy="false" discriminator-value="PType" table="`ptype`">
+		<meta attribute="eclassName">PType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/inv</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ptypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="base" entity-name="PType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ptype_base" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ptype_base_id`"/>
+		</many-to-one>
+		<bag name="subTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`ptype_base_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="PType"/>
+		</bag>
+		<bag name="subNOTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="ptype_subnotypes">
+				<column name="`ptype_subnotypes_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="PType"/>
+		</bag>
+		<bag name="infoReferences" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="ptype_inforeferences">
+				<column name="`ptype_inforeferences_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="PDeclaration"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PDeclarationImpl" entity-name="PDeclaration" abstract="false" lazy="false" discriminator-value="PDeclaration" table="`pdeclaration`">
+		<meta attribute="eclassName">PDeclaration</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/inv</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="pdeclarationdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/InventoryAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/InventoryAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c83a1dea1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/InventoryAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,54 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl" entity-name="PType" abstract="false" lazy="false" table="`ptype`">
+		<meta attribute="eclassName" inherit="false">PType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/inv</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="base" entity-name="PType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ptype_base" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ptype_base_id`"/>
+		</many-to-one>
+		<bag name="subTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`ptype_base_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="PType"/>
+		</bag>
+		<bag name="subNOTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="ptype_subnotypes">
+				<column name="`ptype_subnotypes_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="PType"/>
+		</bag>
+		<bag name="infoReferences" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="ptype_inforeferences">
+				<column name="`ptype_inforeferences_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="PDeclaration"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PDeclarationImpl" entity-name="PDeclaration" abstract="false" lazy="false" table="`pdeclaration`">
+		<meta attribute="eclassName" inherit="false">PDeclaration</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/inv</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/InventoryAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/InventoryAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c83a1dea1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/InventoryAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,54 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl" entity-name="PType" abstract="false" lazy="false" table="`ptype`">
+		<meta attribute="eclassName" inherit="false">PType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/inv</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="base" entity-name="PType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ptype_base" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ptype_base_id`"/>
+		</many-to-one>
+		<bag name="subTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`ptype_base_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="PType"/>
+		</bag>
+		<bag name="subNOTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="ptype_subnotypes">
+				<column name="`ptype_subnotypes_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="PType"/>
+		</bag>
+		<bag name="infoReferences" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="ptype_inforeferences">
+				<column name="`ptype_inforeferences_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="PDeclaration"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PDeclarationImpl" entity-name="PDeclaration" abstract="false" lazy="false" table="`pdeclaration`">
+		<meta attribute="eclassName" inherit="false">PDeclaration</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/inv</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f691b0332
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,148 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.BookDefinitionImpl" entity-name="BookDefinition" abstract="true" lazy="false" discriminator-value="BookDefinition" table="`bookdefinition`">
+		<meta attribute="eclassName">BookDefinition</meta>
+		<meta attribute="epackage">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<id name="uniqueName" type="java.lang.String">
+			<column not-null="true" unique="false" name="`uniquename`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdefinitiondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="location" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`location`"/>
+		</property>
+	</class>
+	<subclass name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.AdultBooksImpl" entity-name="AdultBooks" abstract="false" lazy="false" extends="BookDefinition" discriminator-value="AdultBooks">
+		<meta attribute="eclassName">AdultBooks</meta>
+		<meta attribute="epackage">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="checkedout" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`checkedout`"/>
+		</property>
+		<property name="userid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`userid`"/>
+		</property>
+	</subclass>
+	<class name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.ResourceLinkImpl" entity-name="ResourceLink" abstract="true" lazy="false" discriminator-value="ResourceLink" table="`resourcelink`">
+		<meta attribute="eclassName">ResourceLink</meta>
+		<meta attribute="epackage">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</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 type="string">
+			<column name="dtype" index="resourcelinkdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<subclass name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.BookDefinitionResourceLinkImpl" entity-name="BookDefinitionResourceLink" abstract="false" lazy="false" extends="ResourceLink" discriminator-value="BookDefinitionResourceLink">
+		<meta attribute="eclassName">BookDefinitionResourceLink</meta>
+		<meta attribute="epackage">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<property name="bookSubject" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`booksubject`"/>
+		</property>
+	</subclass>
+	<class name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.BooksInLibImpl" entity-name="BooksInLib" abstract="false" lazy="false" discriminator-value="BooksInLib" table="`booksinlib`">
+		<meta attribute="eclassName">BooksInLib</meta>
+		<meta attribute="epackage">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</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 type="string">
+			<column name="dtype" index="booksinlibdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="library" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="booksinlib_library">
+				<column name="`booksinlib_library_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`booksinlib_library_idx`"/>
+			<one-to-many entity-name="Library"/>
+		</list>
+	</class>
+	<subclass name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.ChildrenBooksImpl" entity-name="ChildrenBooks" abstract="false" lazy="false" extends="BookDefinition" discriminator-value="ChildrenBooks">
+		<meta attribute="eclassName">ChildrenBooks</meta>
+		<meta attribute="epackage">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="cartoon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`cartoon`"/>
+		</property>
+		<property name="popup" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`popup`"/>
+		</property>
+		<many-to-one name="publisherDefinitionRef" entity-name="PublisherDefinition" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="childrenbooks_publisherdefinitionref" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`publisherdefinition_publisherdefinitionref_uniquename`"/>
+		</many-to-one>
+	</subclass>
+	<class name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<id name="uniqueName" type="java.lang.String">
+			<column not-null="true" unique="false" name="`uniquename`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="library" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_library">
+				<column name="`library_library_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_library_idx`"/>
+			<one-to-many entity-name="Library"/>
+		</list>
+		<list name="abstractBookDefinitionGroup" table="`library_abstractbookdefinitiongroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_abstractbookdefinitiongroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_abstractbookdefinitiongroup_idx`"/>
+			<one-to-many entity-name="Library_abstractBookDefinitionGroup"/>
+		</list>
+	</class>
+	<class entity-name="Library_abstractBookDefinitionGroup" lazy="false" table="`library_abstractbookdefinitiongroup`">
+		<meta attribute="featureMap">Library</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="abstractBookDefinition" entity-name="BookDefinition" lazy="false" cascade="all" foreign-key="library_abstractbookdefinition" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`abstractbookdefinitiongroup_bookdefinition_abstractbookdefinition_uniquename`"/>
+		</many-to-one>
+	</class>
+	<subclass name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.PublisherDefinitionImpl" entity-name="PublisherDefinition" abstract="false" lazy="false" extends="BookDefinition" discriminator-value="PublisherDefinition">
+		<meta attribute="eclassName">PublisherDefinition</meta>
+		<meta attribute="epackage">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<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>
+		<many-to-one name="resourceLink" entity-name="BookDefinitionResourceLink" lazy="false" cascade="all" foreign-key="publisherdefinition_resourcelink" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`bookdefinitionresourcelink_resourcelink_e_id`"/>
+		</many-to-one>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a9d8c06c8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,148 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.BookDefinitionImpl" entity-name="BookDefinition" abstract="true" lazy="false" table="`bookdefinition`">
+		<meta attribute="eclassName" inherit="false">BookDefinition</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<id name="uniqueName" type="java.lang.String">
+			<column not-null="true" unique="false" name="`uniquename`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="location" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`location`"/>
+		</property>
+	</class>
+	<joined-subclass name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.AdultBooksImpl" entity-name="AdultBooks" abstract="false" lazy="false" extends="BookDefinition" table="`adultbooks`">
+		<meta attribute="eclassName" inherit="false">AdultBooks</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<key>
+			<column name="`bookdefinition_uniquename`"/>
+		</key>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="checkedout" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`checkedout`"/>
+		</property>
+		<property name="userid" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`userid`"/>
+		</property>
+	</joined-subclass>
+	<class name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.ResourceLinkImpl" entity-name="ResourceLink" abstract="true" lazy="false" table="`resourcelink`">
+		<meta attribute="eclassName" inherit="false">ResourceLink</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<joined-subclass name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.BookDefinitionResourceLinkImpl" entity-name="BookDefinitionResourceLink" abstract="false" lazy="false" extends="ResourceLink" table="`bookdefinitionresourcelink`">
+		<meta attribute="eclassName" inherit="false">BookDefinitionResourceLink</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<key>
+			<column name="`resourcelink_e_id`"/>
+		</key>
+		<property name="bookSubject" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`booksubject`"/>
+		</property>
+	</joined-subclass>
+	<class name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.BooksInLibImpl" entity-name="BooksInLib" abstract="false" lazy="false" table="`booksinlib`">
+		<meta attribute="eclassName" inherit="false">BooksInLib</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="library" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="booksinlib_library">
+				<column name="`booksinlib_library_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`booksinlib_library_idx`"/>
+			<one-to-many entity-name="Library"/>
+		</list>
+	</class>
+	<joined-subclass name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.ChildrenBooksImpl" entity-name="ChildrenBooks" abstract="false" lazy="false" extends="BookDefinition" table="`childrenbooks`">
+		<meta attribute="eclassName" inherit="false">ChildrenBooks</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<key>
+			<column name="`bookdefinition_uniquename`"/>
+		</key>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="cartoon" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`cartoon`"/>
+		</property>
+		<property name="popup" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`popup`"/>
+		</property>
+		<many-to-one name="publisherDefinitionRef" entity-name="PublisherDefinition" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="childrenbooks_publisherdefinitionref" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`publisherdefinition_publisherdefinitionref_uniquename`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<id name="uniqueName" type="java.lang.String">
+			<column not-null="true" unique="false" name="`uniquename`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="library" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_library">
+				<column name="`library_library_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_library_idx`"/>
+			<one-to-many entity-name="Library"/>
+		</list>
+		<list name="abstractBookDefinitionGroup" table="`library_abstractbookdefinitiongroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_abstractbookdefinitiongroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_abstractbookdefinitiongroup_idx`"/>
+			<one-to-many entity-name="Library_abstractBookDefinitionGroup"/>
+		</list>
+	</class>
+	<class entity-name="Library_abstractBookDefinitionGroup" lazy="false" table="`library_abstractbookdefinitiongroup`">
+		<meta attribute="featureMap" inherit="false">Library</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="abstractBookDefinition" entity-name="BookDefinition" lazy="false" cascade="all" foreign-key="library_abstractbookdefinition" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`abstractbookdefinitiongroup_bookdefinition_abstractbookdefinition_uniquename`"/>
+		</many-to-one>
+	</class>
+	<joined-subclass name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.PublisherDefinitionImpl" entity-name="PublisherDefinition" abstract="false" lazy="false" extends="BookDefinition" table="`publisherdefinition`">
+		<meta attribute="eclassName" inherit="false">PublisherDefinition</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<key>
+			<column name="`bookdefinition_uniquename`"/>
+		</key>
+		<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>
+		<many-to-one name="resourceLink" entity-name="BookDefinitionResourceLink" lazy="false" cascade="all" foreign-key="publisherdefinition_resourcelink" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`bookdefinitionresourcelink_resourcelink_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a9d8c06c8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,148 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.BookDefinitionImpl" entity-name="BookDefinition" abstract="true" lazy="false" table="`bookdefinition`">
+		<meta attribute="eclassName" inherit="false">BookDefinition</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<id name="uniqueName" type="java.lang.String">
+			<column not-null="true" unique="false" name="`uniquename`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="location" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`location`"/>
+		</property>
+	</class>
+	<joined-subclass name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.AdultBooksImpl" entity-name="AdultBooks" abstract="false" lazy="false" extends="BookDefinition" table="`adultbooks`">
+		<meta attribute="eclassName" inherit="false">AdultBooks</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<key>
+			<column name="`bookdefinition_uniquename`"/>
+		</key>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="checkedout" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`checkedout`"/>
+		</property>
+		<property name="userid" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`userid`"/>
+		</property>
+	</joined-subclass>
+	<class name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.ResourceLinkImpl" entity-name="ResourceLink" abstract="true" lazy="false" table="`resourcelink`">
+		<meta attribute="eclassName" inherit="false">ResourceLink</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<joined-subclass name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.BookDefinitionResourceLinkImpl" entity-name="BookDefinitionResourceLink" abstract="false" lazy="false" extends="ResourceLink" table="`bookdefinitionresourcelink`">
+		<meta attribute="eclassName" inherit="false">BookDefinitionResourceLink</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<key>
+			<column name="`resourcelink_e_id`"/>
+		</key>
+		<property name="bookSubject" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`booksubject`"/>
+		</property>
+	</joined-subclass>
+	<class name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.BooksInLibImpl" entity-name="BooksInLib" abstract="false" lazy="false" table="`booksinlib`">
+		<meta attribute="eclassName" inherit="false">BooksInLib</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="library" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="booksinlib_library">
+				<column name="`booksinlib_library_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`booksinlib_library_idx`"/>
+			<one-to-many entity-name="Library"/>
+		</list>
+	</class>
+	<joined-subclass name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.ChildrenBooksImpl" entity-name="ChildrenBooks" abstract="false" lazy="false" extends="BookDefinition" table="`childrenbooks`">
+		<meta attribute="eclassName" inherit="false">ChildrenBooks</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<key>
+			<column name="`bookdefinition_uniquename`"/>
+		</key>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="cartoon" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`cartoon`"/>
+		</property>
+		<property name="popup" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`popup`"/>
+		</property>
+		<many-to-one name="publisherDefinitionRef" entity-name="PublisherDefinition" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="childrenbooks_publisherdefinitionref" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`publisherdefinition_publisherdefinitionref_uniquename`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<id name="uniqueName" type="java.lang.String">
+			<column not-null="true" unique="false" name="`uniquename`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="library" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_library">
+				<column name="`library_library_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_library_idx`"/>
+			<one-to-many entity-name="Library"/>
+		</list>
+		<list name="abstractBookDefinitionGroup" table="`library_abstractbookdefinitiongroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_abstractbookdefinitiongroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_abstractbookdefinitiongroup_idx`"/>
+			<one-to-many entity-name="Library_abstractBookDefinitionGroup"/>
+		</list>
+	</class>
+	<class entity-name="Library_abstractBookDefinitionGroup" lazy="false" table="`library_abstractbookdefinitiongroup`">
+		<meta attribute="featureMap" inherit="false">Library</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="abstractBookDefinition" entity-name="BookDefinition" lazy="false" cascade="all" foreign-key="library_abstractbookdefinition" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`abstractbookdefinitiongroup_bookdefinition_abstractbookdefinition_uniquename`"/>
+		</many-to-one>
+	</class>
+	<joined-subclass name="com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl.PublisherDefinitionImpl" entity-name="PublisherDefinition" abstract="false" lazy="false" extends="BookDefinition" table="`publisherdefinition`">
+		<meta attribute="eclassName" inherit="false">PublisherDefinition</meta>
+		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsd</meta>
+		<key>
+			<column name="`bookdefinition_uniquename`"/>
+		</key>
+		<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>
+		<many-to-one name="resourceLink" entity-name="BookDefinitionResourceLink" lazy="false" cascade="all" foreign-key="publisherdefinition_resourcelink" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`bookdefinitionresourcelink_resourcelink_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryCheckNameAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryCheckNameAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2422801d2
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryCheckNameAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="bk_athor" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`bk_thr_d`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="myID" column="myID" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`lb_wr_d`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`tst_indx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="lbrr_bks">
+				<column name="`lb_bk_d`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`lb_bk_dx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="myID" column="myID" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`bk_thr_d`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`wr_bk_dx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryCheckNameAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryCheckNameAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d80593e71
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryCheckNameAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="bk_athor" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`bk_thr_d`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="myID" column="myID" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`lbrry_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`tst_indx`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writr_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="lbrr_bks">
+				<column name="`lb_bk_d`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`lb_bk_dx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="myID" column="myID" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`bk_thr_d`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`wr_bk_dx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryCheckNameAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryCheckNameAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..68dd3d1e1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryCheckNameAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="bk_athor" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`bk_thr_d`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="myID" column="myID" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`lb_wr_d`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`tst_indx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="lbrr_bks">
+				<column name="`lb_bk_d`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`lb_bk_dx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="myID" column="myID" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`bk_thr_d`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`wr_bk_dx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryColLengthAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryColLengthAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8e8c2d6d7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryColLengthAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,98 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="myID" column="myID" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`categ`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`bo_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`libra`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="myID" column="myID" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="libradtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`li_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`li_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`l_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`write`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="myID" column="myID" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="writedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`bo_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`w_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryColLengthAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryColLengthAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0a6515c8e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryColLengthAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,91 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="myID" column="myID" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`categ`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`bo_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`libra`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="myID" column="myID" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`li_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`wr_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`li_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`l_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`write`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="myID" column="myID" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`bo_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`w_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryColLengthAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryColLengthAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..68f6122ec
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryColLengthAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,89 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="myID" column="myID" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`categ`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`bo_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`libra`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="myID" column="myID" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`li_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`li_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`l_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`write`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="myID" column="myID" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`bo_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`w_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDBothAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDBothAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c8ecc0539
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDBothAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDBothAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDBothAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7aa6cdb03
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDBothAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDBothAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDBothAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d4e470760
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDBothAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDFeatureIDAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDFeatureIDAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c8ecc0539
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDFeatureIDAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDFeatureIDAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDFeatureIDAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7aa6cdb03
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDFeatureIDAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDFeatureIDAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDFeatureIDAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d4e470760
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDFeatureIDAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryFKAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryFKAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ee32b44a2
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryFKAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,100 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`" length="50"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryFKAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryFKAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..5107ea0dc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryFKAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,93 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`" length="50"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryFKAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryFKAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ed75fabbe
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryFKAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,91 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`" length="50"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryGlobalEagerAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryGlobalEagerAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..aa01791a3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryGlobalEagerAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="false" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="false" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryGlobalEagerAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryGlobalEagerAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0008a8a88
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryGlobalEagerAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="false" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="false" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryGlobalEagerAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryGlobalEagerAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ff9021da6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryGlobalEagerAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="false" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="false" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..3035e65bb
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,104 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`BOOK`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`TITLE`"/>
+		</id>
+		<discriminator type="string">
+			<column name="DTYPE" index="BOOKDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`PAGES`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`CATEGORY`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`TEST`"/>
+		</property>
+		<join table="WRITER_BOOKS" inverse="true" optional="true">
+			<key update="true">
+				<column name="`BOOK_TITLE`" not-null="true" unique="false"/>
+			</key>
+			<many-to-one name="author" entity-name="Writer" lazy="false" insert="true" update="true" cascade="merge,persist,save-update,lock,refresh" foreign-key="BOOK_AUTHOR">
+				<column not-null="false" unique="false" name="`WRITER_E_ID`"/>
+			</many-to-one>
+		</join>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`LIBRARY`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="DTYPE" index="LIBRARYDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<bag name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="`LIBRARY_WRITERS_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Writer"/>
+		</bag>
+		<bag name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="LIBRARY_BOOKS">
+				<column name="`LIBRARY_BOOKS_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`WRITER`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="DTYPE" index="WRITERDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<bag name="books" table="`WRITER_BOOKS`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`WRITER_E_ID`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Book" unique="true">
+				<column name="`BOOK_TITLE`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fef9bf699
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,97 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`BOOK`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`TITLE`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`PAGES`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`CATEGORY`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`TEST`"/>
+		</property>
+		<join table="`WRITER_BOOKS`" inverse="true" optional="true">
+			<key update="true">
+				<column name="`BOOK_TITLE`" not-null="true" unique="false"/>
+			</key>
+			<many-to-one name="author" entity-name="Writer" lazy="false" insert="true" update="true" cascade="merge,persist,save-update,lock,refresh" foreign-key="BOOK_AUTHOR">
+				<column not-null="false" unique="false" name="`WRITER_E_ID`"/>
+			</many-to-one>
+		</join>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`LIBRARY`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<bag name="writers" fetch="subselect" table="`ABC`" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`LIBRARY_E_ID`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`WRITER_E_ID`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="LIBRARY_BOOKS">
+				<column name="`LIBRARY_BOOKS_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`WRITER`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<bag name="books" table="`WRITER_BOOKS`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`WRITER_E_ID`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Book" unique="true">
+				<column name="`BOOK_TITLE`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..84e44d882
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,95 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`BOOK`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`TITLE`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`PAGES`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`CATEGORY`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`TEST`"/>
+		</property>
+		<join table="`WRITER_BOOKS`" inverse="true" optional="true">
+			<key update="true">
+				<column name="`BOOK_TITLE`" not-null="true" unique="false"/>
+			</key>
+			<many-to-one name="author" entity-name="Writer" lazy="false" insert="true" update="true" cascade="merge,persist,save-update,lock,refresh" foreign-key="BOOK_AUTHOR">
+				<column not-null="false" unique="false" name="`WRITER_E_ID`"/>
+			</many-to-one>
+		</join>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`LIBRARY`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<bag name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="`LIBRARY_WRITERS_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Writer"/>
+		</bag>
+		<bag name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="LIBRARY_BOOKS">
+				<column name="`LIBRARY_BOOKS_E_ID`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`WRITER`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`NAME`"/>
+		</property>
+		<bag name="books" table="`WRITER_BOOKS`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`WRITER_E_ID`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Book" unique="true">
+				<column name="`BOOK_TITLE`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryLargeAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryLargeAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fafce0ec2
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryLargeAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,84 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Writer"/>
+		</bag>
+		<bag name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryLargeAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryLargeAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..29e9bdebd
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryLargeAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,84 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Writer"/>
+		</bag>
+		<bag name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<idbag name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<many-to-many entity-name="Book"/>
+		</idbag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryLargeAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryLargeAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..532d39296
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryLargeAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,81 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Writer"/>
+		</bag>
+		<bag name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsBagAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsBagAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..af279700f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsBagAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,91 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Writer"/>
+		</bag>
+		<bag name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsBagAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsBagAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..cb322220d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsBagAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,84 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsBagAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsBagAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..76f63335f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsBagAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,82 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Writer"/>
+		</bag>
+		<bag name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsIdBagAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsIdBagAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8038a404b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsIdBagAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Writer"/>
+		</bag>
+		<bag name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<idbag name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<many-to-many entity-name="Book"/>
+		</idbag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsIdBagAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsIdBagAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..29e9bdebd
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsIdBagAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,84 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Writer"/>
+		</bag>
+		<bag name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<idbag name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<many-to-many entity-name="Book"/>
+		</idbag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsIdBagAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsIdBagAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..29e9bdebd
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsIdBagAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,84 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Writer"/>
+		</bag>
+		<bag name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Book"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<idbag name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<many-to-many entity-name="Book"/>
+		</idbag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNonResolvingAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNonResolvingAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c8ecc0539
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNonResolvingAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNonResolvingAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNonResolvingAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7aa6cdb03
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNonResolvingAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNonResolvingAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNonResolvingAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d4e470760
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNonResolvingAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNotifyingTestAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNotifyingTestAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c8ecc0539
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNotifyingTestAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNotifyingTestAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNotifyingTestAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7aa6cdb03
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNotifyingTestAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNotifyingTestAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNotifyingTestAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d4e470760
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNotifyingTestAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryQualifyActionHB_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryQualifyActionHB_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..888e14745
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryQualifyActionHB_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="library.Book" abstract="false" lazy="false" discriminator-value="library.Book" table="`library_book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="library_bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="library.Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="library_book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="library.Library" abstract="false" lazy="false" discriminator-value="library.Library" table="`library_library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="library_librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="library.Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="library.Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="library.Writer" abstract="false" lazy="false" discriminator-value="library.Writer" table="`library_writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="library_writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="library.Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryQualifyActionHB_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryQualifyActionHB_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b39306408
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryQualifyActionHB_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="library.Book" abstract="false" lazy="false" table="`library_book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="library.Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="library_book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="library.Library" abstract="false" lazy="false" table="`library_library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="library.Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="library.Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="library.Writer" abstract="false" lazy="false" table="`library_writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="library.Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryQualifyActionHB_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryQualifyActionHB_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9e820c8bc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryQualifyActionHB_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="library.Book" abstract="false" lazy="false" table="`library_book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="library.Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="library_book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="library.Library" abstract="false" lazy="false" table="`library_library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="library.Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="library.Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="library.Writer" abstract="false" lazy="false" table="`library_writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="library.Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c8ecc0539
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7aa6cdb03
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d4e470760
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceCutPasteAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceCutPasteAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..14f4e0c9c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceCutPasteAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceCutPasteAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceCutPasteAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..cb0da7851
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceCutPasteAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceCutPasteAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceCutPasteAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..3a77ab51f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceCutPasteAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceReferenceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceReferenceAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8ef35f329
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceReferenceAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<!--	Generated by Teneo on Wed Mar 28 18:21:01 CEST 2007 -->
+<hibernate-mapping>
+	<typedef name="rental.RentalBicycleTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalBicycleTypeObject</param>
+	</typedef>
+	<typedef name="rental.RentalCarSizeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalCarSizeObject</param>
+	</typedef>
+	<class entity-name="RentalUnit" abstract="true" lazy="false" discriminator-value="RentalUnit" table="`rentalunit`">
+		<meta attribute="eclassName">RentalUnit</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id name="description" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</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>
+	</class>
+	<subclass entity-name="RentalBicycle" abstract="false" lazy="false" extends="RentalUnit" discriminator-value="RentalBicycle">
+		<meta attribute="eclassName">RentalBicycle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
+			</type>
+		</property>
+	</subclass>
+	<class entity-name="RentalBusiness" abstract="false" lazy="false" discriminator-value="RentalBusiness" table="`rentalbusiness`">
+		<meta attribute="eclassName">RentalBusiness</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<subclass entity-name="RentalCar" abstract="false" lazy="false" extends="RentalUnit" discriminator-value="RentalCar">
+		<meta attribute="eclassName">RentalCar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
+			</type>
+		</property>
+	</subclass>
+	<class entity-name="RentalContract" abstract="false" lazy="false" discriminator-value="RentalContract" table="`rentalcontract`">
+		<meta attribute="eclassName">RentalContract</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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="rentToBusinessPartner" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`renttobusinesspartner`"/>
+		</property>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`cost`"/>
+		</property>
+		<list name="rentalUnits" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`rentalcontract_rentalunits_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`rentalcontract_rentalunits_idx`"/>
+			<one-to-many class="RentalUnit"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceReferenceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceReferenceAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e2957d606
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceReferenceAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<!--	Generated by Teneo on Wed Mar 28 18:21:54 CEST 2007 -->
+<hibernate-mapping>
+	<typedef name="rental.RentalBicycleTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalBicycleTypeObject</param>
+	</typedef>
+	<typedef name="rental.RentalCarSizeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalCarSizeObject</param>
+	</typedef>
+	<class entity-name="RentalUnit" abstract="true" lazy="false" table="`rentalunit`">
+		<meta attribute="eclassName">RentalUnit</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id name="description" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</id>
+		<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="RentalBicycle" abstract="false" lazy="false" extends="RentalUnit" table="`rentalbicycle`">
+		<meta attribute="eclassName">RentalBicycle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
+			</type>
+		</property>
+	</joined-subclass>
+	<class entity-name="RentalBusiness" abstract="false" lazy="false" table="`rentalbusiness`">
+		<meta attribute="eclassName">RentalBusiness</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="RentalCar" abstract="false" lazy="false" extends="RentalUnit" table="`rentalcar`">
+		<meta attribute="eclassName">RentalCar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
+			</type>
+		</property>
+	</joined-subclass>
+	<class entity-name="RentalContract" abstract="false" lazy="false" table="`rentalcontract`">
+		<meta attribute="eclassName">RentalContract</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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="rentToBusinessPartner" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`renttobusinesspartner`"/>
+		</property>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`cost`"/>
+		</property>
+		<list name="rentalUnits" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`rentalcontract_rentalunits_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`rentalcontract_rentalunits_idx`"/>
+			<one-to-many class="RentalUnit"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceReferenceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceReferenceAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1f3bd847b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceReferenceAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<!--	Generated by Teneo on Wed Mar 28 18:19:49 CEST 2007 -->
+<hibernate-mapping>
+	<typedef name="rental.RentalBicycleTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalBicycleTypeObject</param>
+	</typedef>
+	<typedef name="rental.RentalCarSizeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalCarSizeObject</param>
+	</typedef>
+	<class entity-name="RentalUnit" abstract="true" lazy="false" table="`rentalunit`">
+		<meta attribute="eclassName">RentalUnit</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id name="description" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</id>
+		<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="RentalBicycle" abstract="false" lazy="false" extends="RentalUnit" table="`rentalbicycle`">
+		<meta attribute="eclassName">RentalBicycle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
+			</type>
+		</property>
+	</joined-subclass>
+	<class entity-name="RentalBusiness" abstract="false" lazy="false" table="`rentalbusiness`">
+		<meta attribute="eclassName">RentalBusiness</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="RentalCar" abstract="false" lazy="false" extends="RentalUnit" table="`rentalcar`">
+		<meta attribute="eclassName">RentalCar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
+			</type>
+		</property>
+	</joined-subclass>
+	<class entity-name="RentalContract" abstract="false" lazy="false" table="`rentalcontract`">
+		<meta attribute="eclassName">RentalContract</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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="rentToBusinessPartner" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`renttobusinesspartner`"/>
+		</property>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`cost`"/>
+		</property>
+		<list name="rentalUnits" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`rentalcontract_rentalunits_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`rentalcontract_rentalunits_idx`"/>
+			<one-to-many class="RentalUnit"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceVisitTreeAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceVisitTreeAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c8ecc0539
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceVisitTreeAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceVisitTreeAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceVisitTreeAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7aa6cdb03
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceVisitTreeAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceVisitTreeAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceVisitTreeAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d4e470760
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceVisitTreeAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibrarySerializationAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibrarySerializationAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c8ecc0539
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibrarySerializationAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibrarySerializationAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibrarySerializationAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7aa6cdb03
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibrarySerializationAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibrarySerializationAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibrarySerializationAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d4e470760
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibrarySerializationAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUnloadAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUnloadAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ce56c8050
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUnloadAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" lazy="false" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUnloadAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUnloadAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..80858c45f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUnloadAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,84 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" lazy="false" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUnloadAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUnloadAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..80858c45f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUnloadAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,84 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
+			<column not-null="true" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" lazy="false" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUseMappingFileAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUseMappingFileAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c8ecc0539
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUseMappingFileAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUseMappingFileAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUseMappingFileAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7aa6cdb03
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUseMappingFileAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUseMappingFileAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUseMappingFileAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d4e470760
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryUseMappingFileAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ListAsIdBagAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ListAsIdBagAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..07299f285
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ListAsIdBagAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,47 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237790.impl.OneImpl" entity-name="One" abstract="false" lazy="false" discriminator-value="One" table="`one`">
+		<meta attribute="eclassName">One</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</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 type="string">
+			<column name="dtype" index="onedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<idbag name="manies" table="`one_many`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`one_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Many" unique="false" foreign-key="one_manies">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</idbag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237790.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" discriminator-value="Many" table="`many`">
+		<meta attribute="eclassName">Many</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</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 type="string">
+			<column name="dtype" index="manydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ListAsIdBagAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ListAsIdBagAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..94dff5a47
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ListAsIdBagAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,41 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237790.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
+		<meta attribute="eclassName" inherit="false">One</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<idbag name="manies" table="`one_many`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`one_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Many" unique="false" foreign-key="one_manies">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</idbag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237790.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
+		<meta attribute="eclassName" inherit="false">Many</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ListAsIdBagAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ListAsIdBagAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..94dff5a47
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ListAsIdBagAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,41 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237790.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
+		<meta attribute="eclassName" inherit="false">One</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<idbag name="manies" table="`one_many`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`one_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Many" unique="false" foreign-key="one_manies">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</idbag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237790.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
+		<meta attribute="eclassName" inherit="false">Many</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fe47c285e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,231 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<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 name="org.example.mindmap.impl.MapImpl" 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 type="string">
+			<column name="dtype" index="mapdtype" length="255" not-null="true"/>
+		</discriminator>
+		<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" foreign-key="map_roottopics">
+				<column name="`map_roottopics_e_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" foreign-key="map_relations">
+				<column name="`map_relations_e_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" foreign-key="map_resources">
+				<column name="`map_resources_e_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 name="org.example.mindmap.impl.RelationshipImpl" 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 type="string">
+			<column name="dtype" index="relationshipdtype" length="255" not-null="true"/>
+		</discriminator>
+		<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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="relationship_source" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`topic_source_e_id`"/>
+		</many-to-one>
+		<many-to-one name="target" entity-name="Topic" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="relationship_target" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`topic_target_e_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>
+				<param name="eclassifier">RelationshipType</param>
+				<param name="epackage">http://www.example.org/mindmap</param>
+			</type>
+		</property>
+	</class>
+	<class name="org.example.mindmap.impl.ResourceImpl" 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 type="string">
+			<column name="dtype" index="resourcedtype" length="255" not-null="true"/>
+		</discriminator>
+		<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_e_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_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`resource_topics_idx`"/>
+			<many-to-many entity-name="Topic" unique="false" foreign-key="resource_topics">
+				<column name="`topic_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.example.mindmap.impl.ThreadImpl" 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 type="string">
+			<column name="dtype" index="threaddtype" length="255" not-null="true"/>
+		</discriminator>
+		<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" foreign-key="thread_items">
+				<column name="`thread_items_e_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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="thread_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`thread_author_e_id`"/>
+		</many-to-one>
+		<property name="postDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`postdate`"/>
+		</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 name="org.example.mindmap.impl.ThreadItemImpl" 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 type="string">
+			<column name="dtype" index="threaditemdtype" length="255" not-null="true"/>
+		</discriminator>
+		<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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="threaditem_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`resource_author_e_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" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`itempostdate`"/>
+		</property>
+	</class>
+	<class name="org.example.mindmap.impl.TopicImpl" 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 type="string">
+			<column name="dtype" index="topicdtype" length="255" not-null="true"/>
+		</discriminator>
+		<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" foreign-key="topic_comments">
+				<column name="`topic_comments_e_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" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</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>
+				<param name="eclassifier">Priority</param>
+				<param name="epackage">http://www.example.org/mindmap</param>
+			</type>
+		</property>
+		<list name="resources" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`topic_resource`">
+			<key update="true">
+				<column name="`topic_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`topic_resources_idx`"/>
+			<many-to-many entity-name="Resource" unique="false" foreign-key="topic_resources">
+				<column name="`resource_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`startdate`"/>
+		</property>
+		<list name="subtopics" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="topic_subtopics">
+				<column name="`topic_subtopics_e_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/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9a0ee5c83
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,213 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<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 name="org.example.mindmap.impl.MapImpl" entity-name="Map" abstract="false" lazy="false" table="`map`">
+		<meta attribute="eclassName" inherit="false">Map</meta>
+		<meta attribute="epackage" inherit="false">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" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="rootTopics" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="map_roottopics">
+				<column name="`map_roottopics_e_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" foreign-key="map_relations">
+				<column name="`map_relations_e_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" foreign-key="map_resources">
+				<column name="`map_resources_e_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 name="org.example.mindmap.impl.RelationshipImpl" entity-name="Relationship" abstract="false" lazy="false" table="`relationship`">
+		<meta attribute="eclassName" inherit="false">Relationship</meta>
+		<meta attribute="epackage" inherit="false">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" inherit="false">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" inherit="false">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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="relationship_source" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`topic_source_e_id`"/>
+		</many-to-one>
+		<many-to-one name="target" entity-name="Topic" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="relationship_target" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`topic_target_e_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>
+				<param name="eclassifier">RelationshipType</param>
+				<param name="epackage">http://www.example.org/mindmap</param>
+			</type>
+		</property>
+	</class>
+	<class name="org.example.mindmap.impl.ResourceImpl" entity-name="Resource" abstract="false" lazy="false" table="`resource`">
+		<meta attribute="eclassName" inherit="false">Resource</meta>
+		<meta attribute="epackage" inherit="false">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" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="comments" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`thread_author_e_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_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`resource_topics_idx`"/>
+			<many-to-many entity-name="Topic" unique="false" foreign-key="resource_topics">
+				<column name="`topic_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.example.mindmap.impl.ThreadImpl" entity-name="Thread" abstract="false" lazy="false" table="`thread`">
+		<meta attribute="eclassName" inherit="false">Thread</meta>
+		<meta attribute="epackage" inherit="false">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" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="items" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="thread_items">
+				<column name="`thread_items_e_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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="thread_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`thread_author_e_id`"/>
+		</many-to-one>
+		<property name="postDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`postdate`"/>
+		</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 name="org.example.mindmap.impl.ThreadItemImpl" entity-name="ThreadItem" abstract="false" lazy="false" table="`threaditem`">
+		<meta attribute="eclassName" inherit="false">ThreadItem</meta>
+		<meta attribute="epackage" inherit="false">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" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="author" entity-name="Resource" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="threaditem_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`resource_author_e_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" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`itempostdate`"/>
+		</property>
+	</class>
+	<class name="org.example.mindmap.impl.TopicImpl" entity-name="Topic" abstract="false" lazy="false" table="`topic`">
+		<meta attribute="eclassName" inherit="false">Topic</meta>
+		<meta attribute="epackage" inherit="false">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" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="comments" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="topic_comments">
+				<column name="`topic_comments_e_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" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</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>
+				<param name="eclassifier">Priority</param>
+				<param name="epackage">http://www.example.org/mindmap</param>
+			</type>
+		</property>
+		<list name="resources" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`topic_resource`">
+			<key update="true">
+				<column name="`topic_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`topic_resources_idx`"/>
+			<many-to-many entity-name="Resource" unique="false" foreign-key="topic_resources">
+				<column name="`resource_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`startdate`"/>
+		</property>
+		<list name="subtopics" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="topic_subtopics">
+				<column name="`topic_subtopics_e_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/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9a0ee5c83
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,213 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<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 name="org.example.mindmap.impl.MapImpl" entity-name="Map" abstract="false" lazy="false" table="`map`">
+		<meta attribute="eclassName" inherit="false">Map</meta>
+		<meta attribute="epackage" inherit="false">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" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="rootTopics" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="map_roottopics">
+				<column name="`map_roottopics_e_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" foreign-key="map_relations">
+				<column name="`map_relations_e_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" foreign-key="map_resources">
+				<column name="`map_resources_e_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 name="org.example.mindmap.impl.RelationshipImpl" entity-name="Relationship" abstract="false" lazy="false" table="`relationship`">
+		<meta attribute="eclassName" inherit="false">Relationship</meta>
+		<meta attribute="epackage" inherit="false">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" inherit="false">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" inherit="false">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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="relationship_source" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`topic_source_e_id`"/>
+		</many-to-one>
+		<many-to-one name="target" entity-name="Topic" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="relationship_target" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`topic_target_e_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>
+				<param name="eclassifier">RelationshipType</param>
+				<param name="epackage">http://www.example.org/mindmap</param>
+			</type>
+		</property>
+	</class>
+	<class name="org.example.mindmap.impl.ResourceImpl" entity-name="Resource" abstract="false" lazy="false" table="`resource`">
+		<meta attribute="eclassName" inherit="false">Resource</meta>
+		<meta attribute="epackage" inherit="false">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" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="comments" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`thread_author_e_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_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`resource_topics_idx`"/>
+			<many-to-many entity-name="Topic" unique="false" foreign-key="resource_topics">
+				<column name="`topic_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.example.mindmap.impl.ThreadImpl" entity-name="Thread" abstract="false" lazy="false" table="`thread`">
+		<meta attribute="eclassName" inherit="false">Thread</meta>
+		<meta attribute="epackage" inherit="false">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" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="items" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="thread_items">
+				<column name="`thread_items_e_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" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="thread_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`thread_author_e_id`"/>
+		</many-to-one>
+		<property name="postDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`postdate`"/>
+		</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 name="org.example.mindmap.impl.ThreadItemImpl" entity-name="ThreadItem" abstract="false" lazy="false" table="`threaditem`">
+		<meta attribute="eclassName" inherit="false">ThreadItem</meta>
+		<meta attribute="epackage" inherit="false">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" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="author" entity-name="Resource" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="threaditem_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`resource_author_e_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" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`itempostdate`"/>
+		</property>
+	</class>
+	<class name="org.example.mindmap.impl.TopicImpl" entity-name="Topic" abstract="false" lazy="false" table="`topic`">
+		<meta attribute="eclassName" inherit="false">Topic</meta>
+		<meta attribute="epackage" inherit="false">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" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="comments" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="topic_comments">
+				<column name="`topic_comments_e_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" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</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>
+				<param name="eclassifier">Priority</param>
+				<param name="epackage">http://www.example.org/mindmap</param>
+			</type>
+		</property>
+		<list name="resources" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`topic_resource`">
+			<key update="true">
+				<column name="`topic_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`topic_resources_idx`"/>
+			<many-to-many entity-name="Resource" unique="false" foreign-key="topic_resources">
+				<column name="`resource_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`startdate`"/>
+		</property>
+		<list name="subtopics" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="topic_subtopics">
+				<column name="`topic_subtopics_e_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/hbm/org.eclipse.emf.teneo.test.emf.sample/NoEscapeLibraryAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/NoEscapeLibraryAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..df2b50638
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/NoEscapeLibraryAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,100 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="book">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="title" length="50"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="pages"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="category"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="book_author_e_id"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="test"/>
+		</property>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="library">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="name" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="library_writers_e_id" not-null="false" unique="false"/>
+			</key>
+			<list-index column="test_index"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_books">
+				<column name="library_books_e_id" not-null="false" unique="false"/>
+			</key>
+			<list-index column="library_books_idx"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="writer">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="name" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="book_author_e_id" not-null="false" unique="false"/>
+			</key>
+			<list-index column="writer_books_idx"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/NoEscapeLibraryAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/NoEscapeLibraryAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..dc6f36230
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/NoEscapeLibraryAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,93 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" table="book">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="title" length="50"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="pages"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="category"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="book_author_e_id"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="test"/>
+		</property>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" table="library">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="name" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" table="abc" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="library_e_id" not-null="true" unique="false"/>
+			</key>
+			<list-index column="test_index"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="writer_e_id" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_books">
+				<column name="library_books_e_id" not-null="false" unique="false"/>
+			</key>
+			<list-index column="library_books_idx"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" table="writer">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="name" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="book_author_e_id" not-null="false" unique="false"/>
+			</key>
+			<list-index column="writer_books_idx"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/NoEscapeLibraryAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/NoEscapeLibraryAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9f30cbd9b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/NoEscapeLibraryAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,91 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" table="book">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="title" length="50"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="pages"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="category"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="book_author_e_id"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="test"/>
+		</property>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" table="library">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="name" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="library_writers_e_id" not-null="false" unique="false"/>
+			</key>
+			<list-index column="test_index"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_books">
+				<column name="library_books_e_id" not-null="false" unique="false"/>
+			</key>
+			<list-index column="library_books_idx"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" table="writer">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="name" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="book_author_e_id" not-null="false" unique="false"/>
+			</key>
+			<list-index column="writer_books_idx"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..84a5ba760
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,236 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.ActTypeImpl" entity-name="ActType" abstract="false" lazy="false" discriminator-value="ActType" table="`acttype`">
+		<meta attribute="eclassName">ActType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</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 type="string">
+			<column name="dtype" index="acttypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="scene" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="acttype_scene">
+				<column name="`acttype_scene_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`acttype_scene_idx`"/>
+			<one-to-many entity-name="SceneType"/>
+		</list>
+		<property name="pindex" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`pindex`"/>
+		</property>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.FmTypeImpl" entity-name="FmType" abstract="false" lazy="false" discriminator-value="FmType" table="`fmtype`">
+		<meta attribute="eclassName">FmType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</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 type="string">
+			<column name="dtype" index="fmtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="p" table="`fmtype_p`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`fmtype_p_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`fmtype_p_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.PersonaeTypeImpl" entity-name="PersonaeType" abstract="false" lazy="false" discriminator-value="PersonaeType" table="`personaetype`">
+		<meta attribute="eclassName">PersonaeType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</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 type="string">
+			<column name="dtype" index="personaetypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="group" table="`personaetype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`personaetype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`personaetype_group_idx`"/>
+			<one-to-many entity-name="PersonaeType_group"/>
+		</list>
+	</class>
+	<class entity-name="PersonaeType_group" lazy="false" table="`personaetype_group`">
+		<meta attribute="featureMap">PersonaeType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`group_title`"/>
+		</property>
+		<property name="persona" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_persona`"/>
+		</property>
+		<many-to-one name="personaGroup" entity-name="PersonaGroupType" lazy="false" cascade="all" foreign-key="personaetype_personagroup" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_personagrouptype_personagroup_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.PersonaGroupTypeImpl" entity-name="PersonaGroupType" abstract="false" lazy="false" discriminator-value="PersonaGroupType" table="`personagrouptype`">
+		<meta attribute="eclassName">PersonaGroupType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</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 type="string">
+			<column name="dtype" index="personagrouptypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="persona" table="`personagrouptype_persona`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`personagrouptype_persona_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`personagrouptype_persona_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+		<property name="groupDescription" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`groupdescription`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.PlayTypeImpl" entity-name="PlayType" abstract="false" lazy="false" discriminator-value="PlayType" table="`playtype`">
+		<meta attribute="eclassName">PlayType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</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 type="string">
+			<column name="dtype" index="playtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<many-to-one name="fm" entity-name="FmType" lazy="false" cascade="all" foreign-key="playtype_fm" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`fmtype_fm_e_id`"/>
+		</many-to-one>
+		<many-to-one name="personae" entity-name="PersonaeType" lazy="false" cascade="all" foreign-key="playtype_personae" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`personaetype_personae_e_id`"/>
+		</many-to-one>
+		<property name="sceneDescription" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`scenedescription`"/>
+		</property>
+		<property name="playSubTitle" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`playsubtitle`"/>
+		</property>
+		<list name="act" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="playtype_act">
+				<column name="`playtype_act_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`playtype_act_idx`"/>
+			<one-to-many entity-name="ActType"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.SceneTypeImpl" entity-name="SceneType" abstract="false" lazy="false" discriminator-value="SceneType" table="`scenetype`">
+		<meta attribute="eclassName">SceneType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</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 type="string">
+			<column name="dtype" index="scenetypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="group" table="`scenetype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`scenetype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`scenetype_group_idx`"/>
+			<one-to-many entity-name="SceneType_group"/>
+		</list>
+		<property name="pindex" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`pindex`"/>
+		</property>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class entity-name="SceneType_group" lazy="false" table="`scenetype_group`">
+		<meta attribute="featureMap">SceneType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="stageDirections" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_stagedirections`"/>
+		</property>
+		<many-to-one name="speech" entity-name="SpeechType" lazy="false" cascade="all" foreign-key="scenetype_speech" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_speechtype_speech_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.SpeechTypeImpl" entity-name="SpeechType" abstract="false" lazy="false" discriminator-value="SpeechType" table="`speechtype`">
+		<meta attribute="eclassName">SpeechType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</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 type="string">
+			<column name="dtype" index="speechtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="group" table="`speechtype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`speechtype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`speechtype_group_idx`"/>
+			<one-to-many entity-name="SpeechType_group"/>
+		</list>
+	</class>
+	<class entity-name="SpeechType_group" lazy="false" table="`speechtype_group`">
+		<meta attribute="featureMap">SpeechType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="speaker" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_speaker`"/>
+		</property>
+		<property name="line" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_line`"/>
+		</property>
+		<property name="stageDirections" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_stagedirections`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c43020897
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,215 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.ActTypeImpl" entity-name="ActType" abstract="false" lazy="false" table="`acttype`">
+		<meta attribute="eclassName" inherit="false">ActType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="scene" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="acttype_scene">
+				<column name="`acttype_scene_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`acttype_scene_idx`"/>
+			<one-to-many entity-name="SceneType"/>
+		</list>
+		<property name="pindex" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`pindex`"/>
+		</property>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.FmTypeImpl" entity-name="FmType" abstract="false" lazy="false" table="`fmtype`">
+		<meta attribute="eclassName" inherit="false">FmType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="p" table="`fmtype_p`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`fmtype_p_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`fmtype_p_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.PersonaeTypeImpl" entity-name="PersonaeType" abstract="false" lazy="false" table="`personaetype`">
+		<meta attribute="eclassName" inherit="false">PersonaeType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="group" table="`personaetype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`personaetype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`personaetype_group_idx`"/>
+			<one-to-many entity-name="PersonaeType_group"/>
+		</list>
+	</class>
+	<class entity-name="PersonaeType_group" lazy="false" table="`personaetype_group`">
+		<meta attribute="featureMap" inherit="false">PersonaeType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`group_title`"/>
+		</property>
+		<property name="persona" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_persona`"/>
+		</property>
+		<many-to-one name="personaGroup" entity-name="PersonaGroupType" lazy="false" cascade="all" foreign-key="personaetype_personagroup" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_personagrouptype_personagroup_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.PersonaGroupTypeImpl" entity-name="PersonaGroupType" abstract="false" lazy="false" table="`personagrouptype`">
+		<meta attribute="eclassName" inherit="false">PersonaGroupType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="persona" table="`personagrouptype_persona`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`personagrouptype_persona_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`personagrouptype_persona_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+		<property name="groupDescription" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`groupdescription`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.PlayTypeImpl" entity-name="PlayType" abstract="false" lazy="false" table="`playtype`">
+		<meta attribute="eclassName" inherit="false">PlayType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<many-to-one name="fm" entity-name="FmType" lazy="false" cascade="all" foreign-key="playtype_fm" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`fmtype_fm_e_id`"/>
+		</many-to-one>
+		<many-to-one name="personae" entity-name="PersonaeType" lazy="false" cascade="all" foreign-key="playtype_personae" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`personaetype_personae_e_id`"/>
+		</many-to-one>
+		<property name="sceneDescription" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`scenedescription`"/>
+		</property>
+		<property name="playSubTitle" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`playsubtitle`"/>
+		</property>
+		<list name="act" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="playtype_act">
+				<column name="`playtype_act_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`playtype_act_idx`"/>
+			<one-to-many entity-name="ActType"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.SceneTypeImpl" entity-name="SceneType" abstract="false" lazy="false" table="`scenetype`">
+		<meta attribute="eclassName" inherit="false">SceneType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="group" table="`scenetype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`scenetype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`scenetype_group_idx`"/>
+			<one-to-many entity-name="SceneType_group"/>
+		</list>
+		<property name="pindex" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`pindex`"/>
+		</property>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class entity-name="SceneType_group" lazy="false" table="`scenetype_group`">
+		<meta attribute="featureMap" inherit="false">SceneType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="stageDirections" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_stagedirections`"/>
+		</property>
+		<many-to-one name="speech" entity-name="SpeechType" lazy="false" cascade="all" foreign-key="scenetype_speech" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_speechtype_speech_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.SpeechTypeImpl" entity-name="SpeechType" abstract="false" lazy="false" table="`speechtype`">
+		<meta attribute="eclassName" inherit="false">SpeechType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="group" table="`speechtype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`speechtype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`speechtype_group_idx`"/>
+			<one-to-many entity-name="SpeechType_group"/>
+		</list>
+	</class>
+	<class entity-name="SpeechType_group" lazy="false" table="`speechtype_group`">
+		<meta attribute="featureMap" inherit="false">SpeechType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="speaker" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_speaker`"/>
+		</property>
+		<property name="line" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_line`"/>
+		</property>
+		<property name="stageDirections" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_stagedirections`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c43020897
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,215 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.ActTypeImpl" entity-name="ActType" abstract="false" lazy="false" table="`acttype`">
+		<meta attribute="eclassName" inherit="false">ActType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="scene" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="acttype_scene">
+				<column name="`acttype_scene_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`acttype_scene_idx`"/>
+			<one-to-many entity-name="SceneType"/>
+		</list>
+		<property name="pindex" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`pindex`"/>
+		</property>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.FmTypeImpl" entity-name="FmType" abstract="false" lazy="false" table="`fmtype`">
+		<meta attribute="eclassName" inherit="false">FmType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="p" table="`fmtype_p`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`fmtype_p_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`fmtype_p_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.PersonaeTypeImpl" entity-name="PersonaeType" abstract="false" lazy="false" table="`personaetype`">
+		<meta attribute="eclassName" inherit="false">PersonaeType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="group" table="`personaetype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`personaetype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`personaetype_group_idx`"/>
+			<one-to-many entity-name="PersonaeType_group"/>
+		</list>
+	</class>
+	<class entity-name="PersonaeType_group" lazy="false" table="`personaetype_group`">
+		<meta attribute="featureMap" inherit="false">PersonaeType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`group_title`"/>
+		</property>
+		<property name="persona" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_persona`"/>
+		</property>
+		<many-to-one name="personaGroup" entity-name="PersonaGroupType" lazy="false" cascade="all" foreign-key="personaetype_personagroup" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_personagrouptype_personagroup_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.PersonaGroupTypeImpl" entity-name="PersonaGroupType" abstract="false" lazy="false" table="`personagrouptype`">
+		<meta attribute="eclassName" inherit="false">PersonaGroupType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="persona" table="`personagrouptype_persona`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`personagrouptype_persona_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`personagrouptype_persona_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+		<property name="groupDescription" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`groupdescription`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.PlayTypeImpl" entity-name="PlayType" abstract="false" lazy="false" table="`playtype`">
+		<meta attribute="eclassName" inherit="false">PlayType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<many-to-one name="fm" entity-name="FmType" lazy="false" cascade="all" foreign-key="playtype_fm" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`fmtype_fm_e_id`"/>
+		</many-to-one>
+		<many-to-one name="personae" entity-name="PersonaeType" lazy="false" cascade="all" foreign-key="playtype_personae" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`personaetype_personae_e_id`"/>
+		</many-to-one>
+		<property name="sceneDescription" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`scenedescription`"/>
+		</property>
+		<property name="playSubTitle" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`playsubtitle`"/>
+		</property>
+		<list name="act" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="playtype_act">
+				<column name="`playtype_act_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`playtype_act_idx`"/>
+			<one-to-many entity-name="ActType"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.SceneTypeImpl" entity-name="SceneType" abstract="false" lazy="false" table="`scenetype`">
+		<meta attribute="eclassName" inherit="false">SceneType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="group" table="`scenetype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`scenetype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`scenetype_group_idx`"/>
+			<one-to-many entity-name="SceneType_group"/>
+		</list>
+		<property name="pindex" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`pindex`"/>
+		</property>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class entity-name="SceneType_group" lazy="false" table="`scenetype_group`">
+		<meta attribute="featureMap" inherit="false">SceneType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="stageDirections" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_stagedirections`"/>
+		</property>
+		<many-to-one name="speech" entity-name="SpeechType" lazy="false" cascade="all" foreign-key="scenetype_speech" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_speechtype_speech_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.play.impl.SpeechTypeImpl" entity-name="SpeechType" abstract="false" lazy="false" table="`speechtype`">
+		<meta attribute="eclassName" inherit="false">SpeechType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/play</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="group" table="`speechtype_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`speechtype_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`speechtype_group_idx`"/>
+			<one-to-many entity-name="SpeechType_group"/>
+		</list>
+	</class>
+	<class entity-name="SpeechType_group" lazy="false" table="`speechtype_group`">
+		<meta attribute="featureMap" inherit="false">SpeechType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="speaker" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_speaker`"/>
+		</property>
+		<property name="line" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_line`"/>
+		</property>
+		<property name="stageDirections" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_stagedirections`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..91a8ec34e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,102 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/schemaprimerpo</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 type="string">
+			<column name="dtype" index="itemdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="productName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`productname`"/>
+		</property>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
+			<column not-null="true" unique="false" name="`quantity`"/>
+		</property>
+		<property name="uSPrice" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`usprice`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`shipdate`"/>
+		</property>
+		<property name="partNum" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`partnum`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" discriminator-value="PurchaseOrder" table="`purchaseorder`">
+		<meta attribute="eclassName">PurchaseOrder</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/schemaprimerpo</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 type="string">
+			<column name="dtype" index="purchaseorderdtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="shipTo" entity-name="USAddress" lazy="false" cascade="all" foreign-key="purchaseorder_shipto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`usaddress_shipto_e_id`"/>
+		</many-to-one>
+		<many-to-one name="billTo" entity-name="USAddress" lazy="false" cascade="all" foreign-key="purchaseorder_billto" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`usaddress_billto_e_id`"/>
+		</many-to-one>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<list name="items" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="purchaseorder_items">
+				<column name="`purchaseorder_items_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`purchaseorder_items_idx`"/>
+			<one-to-many entity-name="Item"/>
+		</list>
+		<property name="orderDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`orderdate`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" discriminator-value="USAddress" table="`usaddress`">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/schemaprimerpo</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 type="string">
+			<column name="dtype" index="usaddressdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+		<property name="state" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`state`"/>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`zip`"/>
+		</property>
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`country`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..962b2fb32
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,93 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
+		<meta attribute="eclassName" inherit="false">Item</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/schemaprimerpo</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="productName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`productname`"/>
+		</property>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
+			<column not-null="true" unique="false" name="`quantity`"/>
+		</property>
+		<property name="uSPrice" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`usprice`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`shipdate`"/>
+		</property>
+		<property name="partNum" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`partnum`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`">
+		<meta attribute="eclassName" inherit="false">PurchaseOrder</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/schemaprimerpo</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="shipTo" entity-name="USAddress" lazy="false" cascade="all" foreign-key="purchaseorder_shipto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`usaddress_shipto_e_id`"/>
+		</many-to-one>
+		<many-to-one name="billTo" entity-name="USAddress" lazy="false" cascade="all" foreign-key="purchaseorder_billto" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`usaddress_billto_e_id`"/>
+		</many-to-one>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<list name="items" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="purchaseorder_items">
+				<column name="`purchaseorder_items_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`purchaseorder_items_idx`"/>
+			<one-to-many entity-name="Item"/>
+		</list>
+		<property name="orderDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`orderdate`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" table="`usaddress`">
+		<meta attribute="eclassName" inherit="false">USAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/schemaprimerpo</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+		<property name="state" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`state`"/>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`zip`"/>
+		</property>
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`country`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..962b2fb32
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,93 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
+		<meta attribute="eclassName" inherit="false">Item</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/schemaprimerpo</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="productName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`productname`"/>
+		</property>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
+			<column not-null="true" unique="false" name="`quantity`"/>
+		</property>
+		<property name="uSPrice" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`usprice`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`shipdate`"/>
+		</property>
+		<property name="partNum" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`partnum`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`">
+		<meta attribute="eclassName" inherit="false">PurchaseOrder</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/schemaprimerpo</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="shipTo" entity-name="USAddress" lazy="false" cascade="all" foreign-key="purchaseorder_shipto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`usaddress_shipto_e_id`"/>
+		</many-to-one>
+		<many-to-one name="billTo" entity-name="USAddress" lazy="false" cascade="all" foreign-key="purchaseorder_billto" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`usaddress_billto_e_id`"/>
+		</many-to-one>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<list name="items" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="purchaseorder_items">
+				<column name="`purchaseorder_items_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`purchaseorder_items_idx`"/>
+			<one-to-many entity-name="Item"/>
+		</list>
+		<property name="orderDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`orderdate`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" table="`usaddress`">
+		<meta attribute="eclassName" inherit="false">USAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/schemaprimerpo</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+		<property name="state" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`state`"/>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`zip`"/>
+		</property>
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`country`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ProductAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ProductAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..758c08539
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ProductAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,81 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`">
+		<meta attribute="eclassName">ProductType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/product</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="producttypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`code`"/>
+		</property>
+		<many-to-one name="supplier" entity-name="SupplierType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_supplier" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`suppliertype_supplier_e_id`"/>
+		</many-to-one>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="createdOn" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="true" unique="false" name="`createdon`"/>
+		</property>
+		<any id-type="long" meta-type="string" name="AnyOne" cascade="all">
+			<column not-null="false" unique="false" name="`anyone_type`"/>
+			<column not-null="false" unique="false" name="`anyone_id`"/>
+		</any>
+		<list name="AnyList" table="`producttype_anylist`" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="producttype_anylist">
+				<column name="`producttype_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`producttype_anylist_idx`"/>
+			<many-to-any id-type="long" meta-type="string">
+				<column not-null="false" unique="false" name="`anylist_type`"/>
+				<column not-null="false" unique="false" name="`anylist_id`"/>
+			</many-to-any>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.SupplierTypeImpl" entity-name="SupplierType" abstract="false" lazy="false" discriminator-value="SupplierType" table="`suppliertype`">
+		<meta attribute="eclassName">SupplierType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/product</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="suppliertypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="noOfEmployees" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`noofemployees`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ClassificationTypeImpl" entity-name="ClassificationType" abstract="false" lazy="false" discriminator-value="ClassificationType" table="`classificationtype`">
+		<meta attribute="eclassName">ClassificationType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/product</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="classificationtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ProductAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ProductAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e30ed7e1e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ProductAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,72 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" table="`producttype`">
+		<meta attribute="eclassName" inherit="false">ProductType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/product</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`code`"/>
+		</property>
+		<many-to-one name="supplier" entity-name="SupplierType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_supplier" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`suppliertype_supplier_e_id`"/>
+		</many-to-one>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="createdOn" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="true" unique="false" name="`createdon`"/>
+		</property>
+		<any id-type="long" meta-type="string" name="AnyOne" cascade="all">
+			<column not-null="false" unique="false" name="`anyone_type`"/>
+			<column not-null="false" unique="false" name="`anyone_id`"/>
+		</any>
+		<list name="AnyList" table="`producttype_anylist`" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="producttype_anylist">
+				<column name="`producttype_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`producttype_anylist_idx`"/>
+			<many-to-any id-type="long" meta-type="string">
+				<column not-null="false" unique="false" name="`anylist_type`"/>
+				<column not-null="false" unique="false" name="`anylist_id`"/>
+			</many-to-any>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.SupplierTypeImpl" entity-name="SupplierType" abstract="false" lazy="false" table="`suppliertype`">
+		<meta attribute="eclassName" inherit="false">SupplierType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/product</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="noOfEmployees" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`noofemployees`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ClassificationTypeImpl" entity-name="ClassificationType" abstract="false" lazy="false" table="`classificationtype`">
+		<meta attribute="eclassName" inherit="false">ClassificationType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/product</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ProductAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ProductAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e30ed7e1e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ProductAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,72 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ProductTypeImpl" entity-name="ProductType" abstract="false" lazy="false" table="`producttype`">
+		<meta attribute="eclassName" inherit="false">ProductType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/product</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`code`"/>
+		</property>
+		<many-to-one name="supplier" entity-name="SupplierType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="producttype_supplier" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`suppliertype_supplier_e_id`"/>
+		</many-to-one>
+		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`price`"/>
+		</property>
+		<property name="createdOn" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="true" unique="false" name="`createdon`"/>
+		</property>
+		<any id-type="long" meta-type="string" name="AnyOne" cascade="all">
+			<column not-null="false" unique="false" name="`anyone_type`"/>
+			<column not-null="false" unique="false" name="`anyone_id`"/>
+		</any>
+		<list name="AnyList" table="`producttype_anylist`" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="producttype_anylist">
+				<column name="`producttype_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`producttype_anylist_idx`"/>
+			<many-to-any id-type="long" meta-type="string">
+				<column not-null="false" unique="false" name="`anylist_type`"/>
+				<column not-null="false" unique="false" name="`anylist_id`"/>
+			</many-to-any>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.SupplierTypeImpl" entity-name="SupplierType" abstract="false" lazy="false" table="`suppliertype`">
+		<meta attribute="eclassName" inherit="false">SupplierType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/product</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="noOfEmployees" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`noofemployees`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.product.impl.ClassificationTypeImpl" entity-name="ClassificationType" abstract="false" lazy="false" table="`classificationtype`">
+		<meta attribute="eclassName" inherit="false">ClassificationType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/product</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalClassifyNamesAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalClassifyNamesAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4db3da3d1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalClassifyNamesAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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 Thu Mar 29 12:19:29 CEST 2007 -->
+<hibernate-mapping>
+	<typedef name="rental.RentalBicycleTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalBicycleTypeObject</param>
+	</typedef>
+	<typedef name="rental.RentalCarSizeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalCarSizeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalUnitImpl" entity-name="RentalUnit" abstract="true" lazy="true" discriminator-value="RentalUnit" table="`rentalunit`" proxy="org.eclipse.emf.teneo.rental.RentalUnit">
+		<meta attribute="eclassName">RentalUnit</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id name="description" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</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>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.rental.impl.RentalBicycleImpl" entity-name="RentalBicycle" abstract="false" lazy="true" extends="RentalUnit" discriminator-value="RentalBicycle" proxy="org.eclipse.emf.teneo.rental.RentalBicycle">
+		<meta attribute="eclassName">RentalBicycle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
+			</type>
+		</property>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.CurrencyImpl" entity-name="Currency" abstract="false" lazy="true" discriminator-value="Currency" table="`currency`" proxy="org.eclipse.emf.teneo.rental.Currency">
+		<meta attribute="eclassName">Currency</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.rental.impl.RentalCarImpl" entity-name="RentalCar" abstract="false" lazy="true" extends="RentalUnit" discriminator-value="RentalCar" proxy="org.eclipse.emf.teneo.rental.RentalCar">
+		<meta attribute="eclassName">RentalCar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
+			</type>
+		</property>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalContractImpl" entity-name="RentalContract" abstract="false" lazy="true" discriminator-value="RentalContract" table="`rentalcontract`" proxy="org.eclipse.emf.teneo.rental.RentalContract">
+		<meta attribute="eclassName">RentalContract</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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="rentToBusinessPartner" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`renttobusinesspartner`"/>
+		</property>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`cost`"/>
+		</property>
+		<list name="rentalUnits" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`rentalcontract_rentalunits_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`rentalcontract_rentalunits_idx`"/>
+			<one-to-many entity-name="RentalUnit"/>
+		</list>
+		<many-to-one name="currency" entity-name="Currency" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`currency_currency_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalClassifyNamesAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalClassifyNamesAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..3d045ca68
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalClassifyNamesAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,97 @@
+<?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 Thu Mar 29 12:20:06 CEST 2007 -->
+<hibernate-mapping>
+	<typedef name="rental.RentalBicycleTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalBicycleTypeObject</param>
+	</typedef>
+	<typedef name="rental.RentalCarSizeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalCarSizeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalUnitImpl" entity-name="RentalUnit" abstract="true" lazy="true" table="`rentalunit`" proxy="org.eclipse.emf.teneo.rental.RentalUnit">
+		<meta attribute="eclassName">RentalUnit</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id name="description" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</id>
+		<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 name="org.eclipse.emf.teneo.rental.impl.RentalBicycleImpl" entity-name="RentalBicycle" abstract="false" lazy="true" extends="RentalUnit" table="`rentalbicycle`" proxy="org.eclipse.emf.teneo.rental.RentalBicycle">
+		<meta attribute="eclassName">RentalBicycle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
+			</type>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.CurrencyImpl" entity-name="Currency" abstract="false" lazy="true" table="`currency`" proxy="org.eclipse.emf.teneo.rental.Currency">
+		<meta attribute="eclassName">Currency</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.rental.impl.RentalCarImpl" entity-name="RentalCar" abstract="false" lazy="true" extends="RentalUnit" table="`rentalcar`" proxy="org.eclipse.emf.teneo.rental.RentalCar">
+		<meta attribute="eclassName">RentalCar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
+			</type>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalContractImpl" entity-name="RentalContract" abstract="false" lazy="true" table="`rentalcontract`" proxy="org.eclipse.emf.teneo.rental.RentalContract">
+		<meta attribute="eclassName">RentalContract</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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="rentToBusinessPartner" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`renttobusinesspartner`"/>
+		</property>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`cost`"/>
+		</property>
+		<list name="rentalUnits" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`rentalcontract_rentalunits_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`rentalcontract_rentalunits_idx`"/>
+			<one-to-many entity-name="RentalUnit"/>
+		</list>
+		<many-to-one name="currency" entity-name="Currency" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`currency_currency_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalClassifyNamesAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalClassifyNamesAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2f5db848d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalClassifyNamesAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,97 @@
+<?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 Thu Mar 29 12:18:31 CEST 2007 -->
+<hibernate-mapping>
+	<typedef name="rental.RentalBicycleTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalBicycleTypeObject</param>
+	</typedef>
+	<typedef name="rental.RentalCarSizeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalCarSizeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalUnitImpl" entity-name="RentalUnit" abstract="true" lazy="true" table="`rentalunit`" proxy="org.eclipse.emf.teneo.rental.RentalUnit">
+		<meta attribute="eclassName">RentalUnit</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id name="description" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</id>
+		<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 name="org.eclipse.emf.teneo.rental.impl.RentalBicycleImpl" entity-name="RentalBicycle" abstract="false" lazy="true" extends="RentalUnit" table="`rentalbicycle`" proxy="org.eclipse.emf.teneo.rental.RentalBicycle">
+		<meta attribute="eclassName">RentalBicycle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
+			</type>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.CurrencyImpl" entity-name="Currency" abstract="false" lazy="true" table="`currency`" proxy="org.eclipse.emf.teneo.rental.Currency">
+		<meta attribute="eclassName">Currency</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.rental.impl.RentalCarImpl" entity-name="RentalCar" abstract="false" lazy="true" extends="RentalUnit" table="`rentalcar`" proxy="org.eclipse.emf.teneo.rental.RentalCar">
+		<meta attribute="eclassName">RentalCar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
+			</type>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalContractImpl" entity-name="RentalContract" abstract="false" lazy="true" table="`rentalcontract`" proxy="org.eclipse.emf.teneo.rental.RentalContract">
+		<meta attribute="eclassName">RentalContract</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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="rentToBusinessPartner" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`renttobusinesspartner`"/>
+		</property>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`cost`"/>
+		</property>
+		<list name="rentalUnits" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`rentalcontract_rentalunits_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`rentalcontract_rentalunits_idx`"/>
+			<one-to-many entity-name="RentalUnit"/>
+		</list>
+		<many-to-one name="currency" entity-name="Currency" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`currency_currency_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalMapAsClassAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalMapAsClassAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..99a02172c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalMapAsClassAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,123 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="rental.RentalBicycleTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalBicycleTypeObject</param>
+	</typedef>
+	<typedef name="rental.RentalCarSizeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalCarSizeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalUnitImpl" entity-name="RentalUnit" abstract="true" lazy="true" discriminator-value="RentalUnit" table="`rentalunit`" proxy="org.eclipse.emf.teneo.rental.RentalUnit">
+		<meta attribute="eclassName">RentalUnit</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id name="description" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="rentalunitdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.rental.impl.RentalBicycleImpl" entity-name="RentalBicycle" abstract="false" lazy="true" extends="RentalUnit" discriminator-value="RentalBicycle" proxy="org.eclipse.emf.teneo.rental.RentalBicycle">
+		<meta attribute="eclassName">RentalBicycle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
+				<param name="eclassifier">RentalBicycleType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+		<many-to-one name="manufacturer" entity-name="Manufacturer" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalbicycle_manufacturer" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`manufacturer_manufacturer_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.CurrencyImpl" entity-name="Currency" abstract="false" lazy="true" discriminator-value="Currency" table="`currency`" proxy="org.eclipse.emf.teneo.rental.Currency">
+		<meta attribute="eclassName">Currency</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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 type="string">
+			<column name="dtype" index="currencydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.rental.impl.RentalCarImpl" entity-name="RentalCar" abstract="false" lazy="true" extends="RentalUnit" discriminator-value="RentalCar" proxy="org.eclipse.emf.teneo.rental.RentalCar">
+		<meta attribute="eclassName">RentalCar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
+				<param name="eclassifier">RentalCarSize</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalContractImpl" entity-name="RentalContract" abstract="false" lazy="true" discriminator-value="RentalContract" table="`rentalcontract`" proxy="org.eclipse.emf.teneo.rental.RentalContract">
+		<meta attribute="eclassName">RentalContract</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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 type="string">
+			<column name="dtype" index="rentalcontractdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="rentToBusinessPartner" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`renttobusinesspartner`"/>
+		</property>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`cost`"/>
+		</property>
+		<list name="rentalUnits" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="rentalcontract_rentalunits">
+				<column name="`rentalcontract_rentalunits_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`rentalcontract_rentalunits_idx`"/>
+			<one-to-many entity-name="RentalUnit"/>
+		</list>
+		<many-to-one name="currency" entity-name="Currency" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalcontract_currency" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`currency_currency_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.rental.impl.ManufacturerImpl" entity-name="Manufacturer" abstract="false" lazy="true" discriminator-value="Manufacturer" table="`manufacturer`" proxy="org.eclipse.emf.teneo.rental.Manufacturer">
+		<meta attribute="eclassName">Manufacturer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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 type="string">
+			<column name="dtype" index="manufacturerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalMapAsClassAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalMapAsClassAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fa76cdd80
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalMapAsClassAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,117 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="rental.RentalBicycleTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalBicycleTypeObject</param>
+	</typedef>
+	<typedef name="rental.RentalCarSizeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalCarSizeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalUnitImpl" entity-name="RentalUnit" abstract="true" lazy="true" table="`rentalunit`" proxy="org.eclipse.emf.teneo.rental.RentalUnit">
+		<meta attribute="eclassName" inherit="false">RentalUnit</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id name="description" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.rental.impl.RentalBicycleImpl" entity-name="RentalBicycle" abstract="false" lazy="true" extends="RentalUnit" table="`rentalbicycle`" proxy="org.eclipse.emf.teneo.rental.RentalBicycle">
+		<meta attribute="eclassName" inherit="false">RentalBicycle</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
+				<param name="eclassifier">RentalBicycleType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+		<many-to-one name="manufacturer" entity-name="Manufacturer" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalbicycle_manufacturer" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`manufacturer_manufacturer_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.CurrencyImpl" entity-name="Currency" abstract="false" lazy="true" table="`currency`" proxy="org.eclipse.emf.teneo.rental.Currency">
+		<meta attribute="eclassName" inherit="false">Currency</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.rental.impl.RentalCarImpl" entity-name="RentalCar" abstract="false" lazy="true" extends="RentalUnit" table="`rentalcar`" proxy="org.eclipse.emf.teneo.rental.RentalCar">
+		<meta attribute="eclassName" inherit="false">RentalCar</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
+				<param name="eclassifier">RentalCarSize</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalContractImpl" entity-name="RentalContract" abstract="false" lazy="true" table="`rentalcontract`" proxy="org.eclipse.emf.teneo.rental.RentalContract">
+		<meta attribute="eclassName" inherit="false">RentalContract</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="rentToBusinessPartner" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`renttobusinesspartner`"/>
+		</property>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`cost`"/>
+		</property>
+		<list name="rentalUnits" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="rentalcontract_rentalunits">
+				<column name="`rentalcontract_rentalunits_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`rentalcontract_rentalunits_idx`"/>
+			<one-to-many entity-name="RentalUnit"/>
+		</list>
+		<many-to-one name="currency" entity-name="Currency" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalcontract_currency" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`currency_currency_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.rental.impl.ManufacturerImpl" entity-name="Manufacturer" abstract="false" lazy="true" table="`manufacturer`" proxy="org.eclipse.emf.teneo.rental.Manufacturer">
+		<meta attribute="eclassName" inherit="false">Manufacturer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalMapAsClassAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalMapAsClassAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..76349a3d3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalMapAsClassAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,120 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="rental.RentalBicycleTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalBicycleTypeObject</param>
+	</typedef>
+	<typedef name="rental.RentalCarSizeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalCarSizeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalUnitImpl" entity-name="RentalUnit" abstract="true" lazy="true" table="`rentalunit`" proxy="org.eclipse.emf.teneo.rental.RentalUnit">
+		<meta attribute="eclassName" inherit="false">RentalUnit</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id name="description" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.rental.impl.RentalBicycleImpl" entity-name="RentalBicycle" abstract="false" lazy="true" extends="RentalUnit" table="`rentalbicycle`" proxy="org.eclipse.emf.teneo.rental.RentalBicycle">
+		<meta attribute="eclassName" inherit="false">RentalBicycle</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
+				<param name="eclassifier">RentalBicycleType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+		<many-to-one name="manufacturer" entity-name="Manufacturer" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalbicycle_manufacturer" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`manufacturer_manufacturer_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.CurrencyImpl" entity-name="Currency" abstract="false" lazy="true" table="`currency`" proxy="org.eclipse.emf.teneo.rental.Currency">
+		<meta attribute="eclassName" inherit="false">Currency</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.rental.impl.RentalCarImpl" entity-name="RentalCar" abstract="false" lazy="true" extends="RentalUnit" table="`rentalcar`" proxy="org.eclipse.emf.teneo.rental.RentalCar">
+		<meta attribute="eclassName" inherit="false">RentalCar</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
+				<param name="eclassifier">RentalCarSize</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalContractImpl" entity-name="RentalContract" abstract="false" lazy="true" table="`rentalcontract`" proxy="org.eclipse.emf.teneo.rental.RentalContract">
+		<meta attribute="eclassName" inherit="false">RentalContract</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="rentToBusinessPartner" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`renttobusinesspartner`"/>
+		</property>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`cost`"/>
+		</property>
+		<list name="rentalUnits" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="rentalcontract_rentalunits">
+				<column name="`rentalcontract_rentalunits_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`rentalcontract_rentalunits_idx`"/>
+			<one-to-many entity-name="RentalUnit"/>
+		</list>
+		<many-to-one name="currency" entity-name="Currency" lazy="proxy" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalcontract_currency" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`currency_currency_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.rental.impl.ManufacturerImpl" entity-name="Manufacturer" abstract="false" lazy="true" table="`manufacturer`" proxy="org.eclipse.emf.teneo.rental.Manufacturer">
+		<meta attribute="eclassName" inherit="false">Manufacturer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+		<property name="trusted" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
+			<column not-null="false" unique="false" name="`trusted`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalResourceReferenceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalResourceReferenceAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a0bf05b2c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalResourceReferenceAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,123 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="rental.RentalBicycleTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalBicycleTypeObject</param>
+	</typedef>
+	<typedef name="rental.RentalCarSizeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalCarSizeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalUnitImpl" entity-name="RentalUnit" abstract="true" lazy="false" discriminator-value="RentalUnit" table="`rentalunit`">
+		<meta attribute="eclassName">RentalUnit</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id name="description" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="rentalunitdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.rental.impl.RentalBicycleImpl" entity-name="RentalBicycle" abstract="false" lazy="false" extends="RentalUnit" discriminator-value="RentalBicycle">
+		<meta attribute="eclassName">RentalBicycle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
+				<param name="eclassifier">RentalBicycleType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+		<many-to-one name="manufacturer" entity-name="Manufacturer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalbicycle_manufacturer" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`manufacturer_manufacturer_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.CurrencyImpl" entity-name="Currency" abstract="false" lazy="false" discriminator-value="Currency" table="`currency`">
+		<meta attribute="eclassName">Currency</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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 type="string">
+			<column name="dtype" index="currencydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.rental.impl.RentalCarImpl" entity-name="RentalCar" abstract="false" lazy="false" extends="RentalUnit" discriminator-value="RentalCar">
+		<meta attribute="eclassName">RentalCar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
+				<param name="eclassifier">RentalCarSize</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalContractImpl" entity-name="RentalContract" abstract="false" lazy="false" discriminator-value="RentalContract" table="`rentalcontract`">
+		<meta attribute="eclassName">RentalContract</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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 type="string">
+			<column name="dtype" index="rentalcontractdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="rentToBusinessPartner" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`renttobusinesspartner`"/>
+		</property>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`cost`"/>
+		</property>
+		<list name="rentalUnits" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="rentalcontract_rentalunits">
+				<column name="`rentalcontract_rentalunits_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`rentalcontract_rentalunits_idx`"/>
+			<one-to-many entity-name="RentalUnit"/>
+		</list>
+		<many-to-one name="currency" entity-name="Currency" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalcontract_currency" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`currency_currency_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.rental.impl.ManufacturerImpl" entity-name="Manufacturer" abstract="false" lazy="false" discriminator-value="Manufacturer" table="`manufacturer`">
+		<meta attribute="eclassName">Manufacturer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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 type="string">
+			<column name="dtype" index="manufacturerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalResourceReferenceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalResourceReferenceAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2d79f6607
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalResourceReferenceAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,117 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="rental.RentalBicycleTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalBicycleTypeObject</param>
+	</typedef>
+	<typedef name="rental.RentalCarSizeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalCarSizeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalUnitImpl" entity-name="RentalUnit" abstract="true" lazy="false" table="`rentalunit`">
+		<meta attribute="eclassName" inherit="false">RentalUnit</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id name="description" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.rental.impl.RentalBicycleImpl" entity-name="RentalBicycle" abstract="false" lazy="false" extends="RentalUnit" table="`rentalbicycle`">
+		<meta attribute="eclassName" inherit="false">RentalBicycle</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
+				<param name="eclassifier">RentalBicycleType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+		<many-to-one name="manufacturer" entity-name="Manufacturer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalbicycle_manufacturer" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`manufacturer_manufacturer_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.CurrencyImpl" entity-name="Currency" abstract="false" lazy="false" table="`currency`">
+		<meta attribute="eclassName" inherit="false">Currency</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.rental.impl.RentalCarImpl" entity-name="RentalCar" abstract="false" lazy="false" extends="RentalUnit" table="`rentalcar`">
+		<meta attribute="eclassName" inherit="false">RentalCar</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
+				<param name="eclassifier">RentalCarSize</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalContractImpl" entity-name="RentalContract" abstract="false" lazy="false" table="`rentalcontract`">
+		<meta attribute="eclassName" inherit="false">RentalContract</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="rentToBusinessPartner" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`renttobusinesspartner`"/>
+		</property>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`cost`"/>
+		</property>
+		<list name="rentalUnits" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="rentalcontract_rentalunits">
+				<column name="`rentalcontract_rentalunits_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`rentalcontract_rentalunits_idx`"/>
+			<one-to-many entity-name="RentalUnit"/>
+		</list>
+		<many-to-one name="currency" entity-name="Currency" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalcontract_currency" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`currency_currency_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.rental.impl.ManufacturerImpl" entity-name="Manufacturer" abstract="false" lazy="false" table="`manufacturer`">
+		<meta attribute="eclassName" inherit="false">Manufacturer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalResourceReferenceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalResourceReferenceAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c92641ce3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalResourceReferenceAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,120 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="rental.RentalBicycleTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalBicycleTypeObject</param>
+	</typedef>
+	<typedef name="rental.RentalCarSizeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalCarSizeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalUnitImpl" entity-name="RentalUnit" abstract="true" lazy="false" table="`rentalunit`">
+		<meta attribute="eclassName" inherit="false">RentalUnit</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id name="description" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.rental.impl.RentalBicycleImpl" entity-name="RentalBicycle" abstract="false" lazy="false" extends="RentalUnit" table="`rentalbicycle`">
+		<meta attribute="eclassName" inherit="false">RentalBicycle</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
+				<param name="eclassifier">RentalBicycleType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+		<many-to-one name="manufacturer" entity-name="Manufacturer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalbicycle_manufacturer" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`manufacturer_manufacturer_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.CurrencyImpl" entity-name="Currency" abstract="false" lazy="false" table="`currency`">
+		<meta attribute="eclassName" inherit="false">Currency</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.rental.impl.RentalCarImpl" entity-name="RentalCar" abstract="false" lazy="false" extends="RentalUnit" table="`rentalcar`">
+		<meta attribute="eclassName" inherit="false">RentalCar</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
+				<param name="eclassifier">RentalCarSize</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalContractImpl" entity-name="RentalContract" abstract="false" lazy="false" table="`rentalcontract`">
+		<meta attribute="eclassName" inherit="false">RentalContract</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="rentToBusinessPartner" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`renttobusinesspartner`"/>
+		</property>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`cost`"/>
+		</property>
+		<list name="rentalUnits" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="rentalcontract_rentalunits">
+				<column name="`rentalcontract_rentalunits_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`rentalcontract_rentalunits_idx`"/>
+			<one-to-many entity-name="RentalUnit"/>
+		</list>
+		<many-to-one name="currency" entity-name="Currency" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalcontract_currency" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`currency_currency_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.rental.impl.ManufacturerImpl" entity-name="Manufacturer" abstract="false" lazy="false" table="`manufacturer`">
+		<meta attribute="eclassName" inherit="false">Manufacturer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+		<property name="trusted" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
+			<column not-null="false" unique="false" name="`trusted`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..22e89b45b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" lazy="false" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="writer_books">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2f9c4069f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,84 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" lazy="false" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="writer_books">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2f9c4069f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,84 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" lazy="false" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_writers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="writer_books">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryResourceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryResourceAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c8ecc0539
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryResourceAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryResourceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryResourceAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7aa6cdb03
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryResourceAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,87 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" table="`abc`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`library_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+				<column name="`writer_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryResourceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryResourceAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d4e470760
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryResourceAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleRentalAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleRentalAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a0bf05b2c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleRentalAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,123 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="rental.RentalBicycleTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalBicycleTypeObject</param>
+	</typedef>
+	<typedef name="rental.RentalCarSizeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalCarSizeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalUnitImpl" entity-name="RentalUnit" abstract="true" lazy="false" discriminator-value="RentalUnit" table="`rentalunit`">
+		<meta attribute="eclassName">RentalUnit</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id name="description" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="rentalunitdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.rental.impl.RentalBicycleImpl" entity-name="RentalBicycle" abstract="false" lazy="false" extends="RentalUnit" discriminator-value="RentalBicycle">
+		<meta attribute="eclassName">RentalBicycle</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
+				<param name="eclassifier">RentalBicycleType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+		<many-to-one name="manufacturer" entity-name="Manufacturer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalbicycle_manufacturer" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`manufacturer_manufacturer_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.CurrencyImpl" entity-name="Currency" abstract="false" lazy="false" discriminator-value="Currency" table="`currency`">
+		<meta attribute="eclassName">Currency</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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 type="string">
+			<column name="dtype" index="currencydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.rental.impl.RentalCarImpl" entity-name="RentalCar" abstract="false" lazy="false" extends="RentalUnit" discriminator-value="RentalCar">
+		<meta attribute="eclassName">RentalCar</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</meta>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
+				<param name="eclassifier">RentalCarSize</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalContractImpl" entity-name="RentalContract" abstract="false" lazy="false" discriminator-value="RentalContract" table="`rentalcontract`">
+		<meta attribute="eclassName">RentalContract</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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 type="string">
+			<column name="dtype" index="rentalcontractdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="rentToBusinessPartner" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`renttobusinesspartner`"/>
+		</property>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`cost`"/>
+		</property>
+		<list name="rentalUnits" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="rentalcontract_rentalunits">
+				<column name="`rentalcontract_rentalunits_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`rentalcontract_rentalunits_idx`"/>
+			<one-to-many entity-name="RentalUnit"/>
+		</list>
+		<many-to-one name="currency" entity-name="Currency" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalcontract_currency" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`currency_currency_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.rental.impl.ManufacturerImpl" entity-name="Manufacturer" abstract="false" lazy="false" discriminator-value="Manufacturer" table="`manufacturer`">
+		<meta attribute="eclassName">Manufacturer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/rental</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 type="string">
+			<column name="dtype" index="manufacturerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleRentalAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleRentalAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2d79f6607
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleRentalAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,117 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="rental.RentalBicycleTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalBicycleTypeObject</param>
+	</typedef>
+	<typedef name="rental.RentalCarSizeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalCarSizeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalUnitImpl" entity-name="RentalUnit" abstract="true" lazy="false" table="`rentalunit`">
+		<meta attribute="eclassName" inherit="false">RentalUnit</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id name="description" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.rental.impl.RentalBicycleImpl" entity-name="RentalBicycle" abstract="false" lazy="false" extends="RentalUnit" table="`rentalbicycle`">
+		<meta attribute="eclassName" inherit="false">RentalBicycle</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
+				<param name="eclassifier">RentalBicycleType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+		<many-to-one name="manufacturer" entity-name="Manufacturer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalbicycle_manufacturer" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`manufacturer_manufacturer_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.CurrencyImpl" entity-name="Currency" abstract="false" lazy="false" table="`currency`">
+		<meta attribute="eclassName" inherit="false">Currency</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.rental.impl.RentalCarImpl" entity-name="RentalCar" abstract="false" lazy="false" extends="RentalUnit" table="`rentalcar`">
+		<meta attribute="eclassName" inherit="false">RentalCar</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
+				<param name="eclassifier">RentalCarSize</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalContractImpl" entity-name="RentalContract" abstract="false" lazy="false" table="`rentalcontract`">
+		<meta attribute="eclassName" inherit="false">RentalContract</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="rentToBusinessPartner" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`renttobusinesspartner`"/>
+		</property>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`cost`"/>
+		</property>
+		<list name="rentalUnits" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="rentalcontract_rentalunits">
+				<column name="`rentalcontract_rentalunits_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`rentalcontract_rentalunits_idx`"/>
+			<one-to-many entity-name="RentalUnit"/>
+		</list>
+		<many-to-one name="currency" entity-name="Currency" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalcontract_currency" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`currency_currency_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.rental.impl.ManufacturerImpl" entity-name="Manufacturer" abstract="false" lazy="false" table="`manufacturer`">
+		<meta attribute="eclassName" inherit="false">Manufacturer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleRentalAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleRentalAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c92641ce3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleRentalAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,120 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="rental.RentalBicycleTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalBicycleTypeObject</param>
+	</typedef>
+	<typedef name="rental.RentalCarSizeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+		<param name="edatatype">RentalCarSizeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalUnitImpl" entity-name="RentalUnit" abstract="true" lazy="false" table="`rentalunit`">
+		<meta attribute="eclassName" inherit="false">RentalUnit</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id name="description" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.rental.impl.RentalBicycleImpl" entity-name="RentalBicycle" abstract="false" lazy="false" extends="RentalUnit" table="`rentalbicycle`">
+		<meta attribute="eclassName" inherit="false">RentalBicycle</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
+				<param name="eclassifier">RentalBicycleType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+		<many-to-one name="manufacturer" entity-name="Manufacturer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalbicycle_manufacturer" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`manufacturer_manufacturer_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.CurrencyImpl" entity-name="Currency" abstract="false" lazy="false" table="`currency`">
+		<meta attribute="eclassName" inherit="false">Currency</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.rental.impl.RentalCarImpl" entity-name="RentalCar" abstract="false" lazy="false" extends="RentalUnit" table="`rentalcar`">
+		<meta attribute="eclassName" inherit="false">RentalCar</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<key>
+			<column name="`rentalunit_description`"/>
+		</key>
+		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`size`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
+				<param name="eclassifier">RentalCarSize</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
+			</type>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.rental.impl.RentalContractImpl" entity-name="RentalContract" abstract="false" lazy="false" table="`rentalcontract`">
+		<meta attribute="eclassName" inherit="false">RentalContract</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="rentToBusinessPartner" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`renttobusinesspartner`"/>
+		</property>
+		<property name="startDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`startdate`"/>
+		</property>
+		<property name="endDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`enddate`"/>
+		</property>
+		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`cost`"/>
+		</property>
+		<list name="rentalUnits" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="rentalcontract_rentalunits">
+				<column name="`rentalcontract_rentalunits_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`rentalcontract_rentalunits_idx`"/>
+			<one-to-many entity-name="RentalUnit"/>
+		</list>
+		<many-to-one name="currency" entity-name="Currency" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="rentalcontract_currency" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`currency_currency_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.rental.impl.ManufacturerImpl" entity-name="Manufacturer" abstract="false" lazy="false" table="`manufacturer`">
+		<meta attribute="eclassName" inherit="false">Manufacturer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rental</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</property>
+		<property name="trusted" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
+			<column not-null="false" unique="false" name="`trusted`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9065f62b7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,138 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="sunBooks.BookCategoryTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</param>
+		<param name="edatatype">BookCategoryTypeObject</param>
+	</typedef>
+	<typedef name="sunBooks.BookCategoryTypeObject1" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</param>
+		<param name="edatatype">BookCategoryTypeObject1</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.AuthorsTypeImpl" entity-name="AuthorsType" abstract="false" lazy="false" discriminator-value="AuthorsType" table="`authorstype`">
+		<meta attribute="eclassName">AuthorsType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</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 type="string">
+			<column name="dtype" index="authorstypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="authorName" table="`authorstype_authorname`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`authorstype_authorname_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`authorstype_authorname_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.BooksTypeImpl" entity-name="BooksType" abstract="false" lazy="false" discriminator-value="BooksType" table="`bookstype`">
+		<meta attribute="eclassName">BooksType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</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 type="string">
+			<column name="dtype" index="bookstypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="book" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="bookstype_book">
+				<column name="`bookstype_book_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`bookstype_book_idx`"/>
+			<one-to-many entity-name="BookType"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.BookTypeImpl" entity-name="BookType" abstract="false" lazy="false" discriminator-value="BookType" table="`booktype`">
+		<meta attribute="eclassName">BookType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</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 type="string">
+			<column name="dtype" index="booktypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="iSBN" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`isbn`"/>
+		</property>
+		<property name="price" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`price`"/>
+		</property>
+		<many-to-one name="authors" entity-name="AuthorsType" lazy="false" cascade="all" foreign-key="booktype_authors" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`authorstype_authors_e_id`"/>
+		</many-to-one>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`description`"/>
+		</property>
+		<many-to-one name="promotion" entity-name="PromotionType" lazy="false" cascade="all" foreign-key="booktype_promotion" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`promotiontype_promotion_e_id`"/>
+		</many-to-one>
+		<property name="publicationDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="true" unique="false" name="`publicationdate`"/>
+		</property>
+		<property name="bookCategory" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`bookcategory`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.sunBooks.BookCategoryType1</param>
+				<param name="eclassifier">BookCategoryType1</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</param>
+			</type>
+		</property>
+		<property name="itemId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`itemid`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.CollectionTypeImpl" entity-name="CollectionType" abstract="false" lazy="false" discriminator-value="CollectionType" table="`collectiontype`">
+		<meta attribute="eclassName">CollectionType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</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 type="string">
+			<column name="dtype" index="collectiontypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="books" entity-name="BooksType" lazy="false" cascade="all" foreign-key="collectiontype_books" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`bookstype_books_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.PromotionTypeImpl" entity-name="PromotionType" abstract="false" lazy="false" discriminator-value="PromotionType" table="`promotiontype`">
+		<meta attribute="eclassName">PromotionType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</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 type="string">
+			<column name="dtype" index="promotiontypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="discount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`discount`"/>
+		</property>
+		<property name="none" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`none`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..30fab8e09
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,123 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="sunBooks.BookCategoryTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</param>
+		<param name="edatatype">BookCategoryTypeObject</param>
+	</typedef>
+	<typedef name="sunBooks.BookCategoryTypeObject1" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</param>
+		<param name="edatatype">BookCategoryTypeObject1</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.AuthorsTypeImpl" entity-name="AuthorsType" abstract="false" lazy="false" table="`authorstype`">
+		<meta attribute="eclassName" inherit="false">AuthorsType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="authorName" table="`authorstype_authorname`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`authorstype_authorname_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`authorstype_authorname_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.BooksTypeImpl" entity-name="BooksType" abstract="false" lazy="false" table="`bookstype`">
+		<meta attribute="eclassName" inherit="false">BooksType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="book" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="bookstype_book">
+				<column name="`bookstype_book_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`bookstype_book_idx`"/>
+			<one-to-many entity-name="BookType"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.BookTypeImpl" entity-name="BookType" abstract="false" lazy="false" table="`booktype`">
+		<meta attribute="eclassName" inherit="false">BookType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="iSBN" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`isbn`"/>
+		</property>
+		<property name="price" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`price`"/>
+		</property>
+		<many-to-one name="authors" entity-name="AuthorsType" lazy="false" cascade="all" foreign-key="booktype_authors" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`authorstype_authors_e_id`"/>
+		</many-to-one>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`description`"/>
+		</property>
+		<many-to-one name="promotion" entity-name="PromotionType" lazy="false" cascade="all" foreign-key="booktype_promotion" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`promotiontype_promotion_e_id`"/>
+		</many-to-one>
+		<property name="publicationDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="true" unique="false" name="`publicationdate`"/>
+		</property>
+		<property name="bookCategory" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`bookcategory`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.sunBooks.BookCategoryType1</param>
+				<param name="eclassifier">BookCategoryType1</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</param>
+			</type>
+		</property>
+		<property name="itemId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`itemid`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.CollectionTypeImpl" entity-name="CollectionType" abstract="false" lazy="false" table="`collectiontype`">
+		<meta attribute="eclassName" inherit="false">CollectionType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="books" entity-name="BooksType" lazy="false" cascade="all" foreign-key="collectiontype_books" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`bookstype_books_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.PromotionTypeImpl" entity-name="PromotionType" abstract="false" lazy="false" table="`promotiontype`">
+		<meta attribute="eclassName" inherit="false">PromotionType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="discount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`discount`"/>
+		</property>
+		<property name="none" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`none`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..30fab8e09
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,123 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="sunBooks.BookCategoryTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</param>
+		<param name="edatatype">BookCategoryTypeObject</param>
+	</typedef>
+	<typedef name="sunBooks.BookCategoryTypeObject1" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</param>
+		<param name="edatatype">BookCategoryTypeObject1</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.AuthorsTypeImpl" entity-name="AuthorsType" abstract="false" lazy="false" table="`authorstype`">
+		<meta attribute="eclassName" inherit="false">AuthorsType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="authorName" table="`authorstype_authorname`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`authorstype_authorname_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`authorstype_authorname_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.BooksTypeImpl" entity-name="BooksType" abstract="false" lazy="false" table="`bookstype`">
+		<meta attribute="eclassName" inherit="false">BooksType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="book" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="bookstype_book">
+				<column name="`bookstype_book_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`bookstype_book_idx`"/>
+			<one-to-many entity-name="BookType"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.BookTypeImpl" entity-name="BookType" abstract="false" lazy="false" table="`booktype`">
+		<meta attribute="eclassName" inherit="false">BookType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="iSBN" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`isbn`"/>
+		</property>
+		<property name="price" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`price`"/>
+		</property>
+		<many-to-one name="authors" entity-name="AuthorsType" lazy="false" cascade="all" foreign-key="booktype_authors" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`authorstype_authors_e_id`"/>
+		</many-to-one>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`description`"/>
+		</property>
+		<many-to-one name="promotion" entity-name="PromotionType" lazy="false" cascade="all" foreign-key="booktype_promotion" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`promotiontype_promotion_e_id`"/>
+		</many-to-one>
+		<property name="publicationDate" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="true" unique="false" name="`publicationdate`"/>
+		</property>
+		<property name="bookCategory" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`bookcategory`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.sunBooks.BookCategoryType1</param>
+				<param name="eclassifier">BookCategoryType1</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</param>
+			</type>
+		</property>
+		<property name="itemId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`itemid`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.CollectionTypeImpl" entity-name="CollectionType" abstract="false" lazy="false" table="`collectiontype`">
+		<meta attribute="eclassName" inherit="false">CollectionType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="books" entity-name="BooksType" lazy="false" cascade="all" foreign-key="collectiontype_books" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`bookstype_books_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl.PromotionTypeImpl" entity-name="PromotionType" abstract="false" lazy="false" table="`promotiontype`">
+		<meta attribute="eclassName" inherit="false">PromotionType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_books</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="discount" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`discount`"/>
+		</property>
+		<property name="none" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`none`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/WorkFlowAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/WorkFlowAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9562f4eea
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/WorkFlowAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,180 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowElementImpl" entity-name="WorkflowElement" abstract="true" lazy="false" discriminator-value="WorkflowElement" table="`workflowelement`">
+		<meta attribute="eclassName">WorkflowElement</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="workflowelementdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<property name="x" 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>
+		<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>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowImpl" entity-name="Workflow" abstract="false" lazy="false" extends="WorkflowElement" discriminator-value="Workflow">
+		<meta attribute="eclassName">Workflow</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<list name="nodes" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`workflownode_workflow_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workflow_nodes_idx`"/>
+			<one-to-many entity-name="WorkflowNode"/>
+		</list>
+		<list name="edges" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`edge_workflow_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workflow_edges_idx`"/>
+			<one-to-many entity-name="Edge"/>
+		</list>
+		<list name="comments" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`comment_workflow_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workflow_comments_idx`"/>
+			<one-to-many entity-name="Comment"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowNodeImpl" entity-name="WorkflowNode" abstract="true" lazy="false" extends="WorkflowElement" discriminator-value="WorkflowNode">
+		<meta attribute="eclassName">WorkflowNode</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<many-to-one name="workflow" entity-name="Workflow" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="workflownode_workflow" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`workflownode_workflow_id`"/>
+		</many-to-one>
+		<list name="outputs" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`outputport_node_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workflownode_outputs_idx`"/>
+			<one-to-many entity-name="OutputPort"/>
+		</list>
+		<list name="inputs" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`inputport_node_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workflownode_inputs_idx`"/>
+			<one-to-many entity-name="InputPort"/>
+		</list>
+		<property name="isStart" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`isstart`"/>
+		</property>
+		<property name="isFinish" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`isfinish`"/>
+		</property>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.EdgeImpl" entity-name="Edge" abstract="false" lazy="false" extends="WorkflowElement" discriminator-value="Edge">
+		<meta attribute="eclassName">Edge</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<many-to-one name="workflow" entity-name="Workflow" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="edge_workflow" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`edge_workflow_id`"/>
+		</many-to-one>
+		<many-to-one name="target" entity-name="InputPort" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="edge_target" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`edge_target_id`"/>
+		</many-to-one>
+		<many-to-one name="source" entity-name="OutputPort" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="edge_source" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`edge_source_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.PortImpl" entity-name="Port" abstract="true" lazy="false" extends="WorkflowElement" discriminator-value="Port">
+		<meta attribute="eclassName">Port</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.InputPortImpl" entity-name="InputPort" abstract="false" lazy="false" extends="Port" discriminator-value="InputPort">
+		<meta attribute="eclassName">InputPort</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<many-to-one name="node" entity-name="WorkflowNode" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="inputport_node" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`inputport_node_id`"/>
+		</many-to-one>
+		<list name="edges" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`edge_target_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`inputport_edges_idx`"/>
+			<one-to-many entity-name="Edge"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.OutputPortImpl" entity-name="OutputPort" abstract="false" lazy="false" extends="Port" discriminator-value="OutputPort">
+		<meta attribute="eclassName">OutputPort</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<many-to-one name="node" entity-name="WorkflowNode" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="outputport_node" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`outputport_node_id`"/>
+		</many-to-one>
+		<list name="edges" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`edge_source_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`outputport_edges_idx`"/>
+			<one-to-many entity-name="Edge"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.FaultImpl" entity-name="Fault" abstract="false" lazy="false" extends="OutputPort" discriminator-value="Fault">
+		<meta attribute="eclassName">Fault</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.CompoundTaskImpl" entity-name="CompoundTask" abstract="false" lazy="false" extends="WorkflowNode" discriminator-value="CompoundTask">
+		<meta attribute="eclassName">CompoundTask</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<many-to-one name="subworkflow" entity-name="Workflow" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="compoundtask_subworkflow" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`workflow_subworkflow_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.TransformationTaskImpl" entity-name="TransformationTask" abstract="false" lazy="false" extends="WorkflowNode" discriminator-value="TransformationTask">
+		<meta attribute="eclassName">TransformationTask</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<property name="transformExpression" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`transformexpression`"/>
+		</property>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.ConditionalTaskImpl" entity-name="ConditionalTask" abstract="false" lazy="false" extends="WorkflowNode" discriminator-value="ConditionalTask">
+		<meta attribute="eclassName">ConditionalTask</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.LoopTaskImpl" entity-name="LoopTask" abstract="false" lazy="false" extends="CompoundTask" discriminator-value="LoopTask">
+		<meta attribute="eclassName">LoopTask</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<property name="whileCondition" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`whilecondition`"/>
+		</property>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.ConditionalOutputPortImpl" entity-name="ConditionalOutputPort" abstract="false" lazy="false" extends="OutputPort" discriminator-value="ConditionalOutputPort">
+		<meta attribute="eclassName">ConditionalOutputPort</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<property name="condition" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`condition`"/>
+		</property>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.CommentImpl" entity-name="Comment" abstract="false" lazy="false" extends="WorkflowElement" discriminator-value="Comment">
+		<meta attribute="eclassName">Comment</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<many-to-one name="workflow" entity-name="Workflow" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="comment_workflow" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`comment_workflow_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.TaskImpl" entity-name="Task" abstract="false" lazy="false" extends="WorkflowNode" discriminator-value="Task">
+		<meta attribute="eclassName">Task</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/WorkFlowAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/WorkFlowAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..740acf1bd
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/WorkFlowAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,219 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowElementImpl" entity-name="WorkflowElement" abstract="true" lazy="false" table="`workflowelement`">
+		<meta attribute="eclassName" inherit="false">WorkflowElement</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<property name="x" 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>
+		<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>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowImpl" entity-name="Workflow" abstract="false" lazy="false" extends="WorkflowElement" table="`workflow`">
+		<meta attribute="eclassName" inherit="false">Workflow</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflowelement_id`"/>
+		</key>
+		<list name="nodes" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`workflownode_workflow_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workflow_nodes_idx`"/>
+			<one-to-many entity-name="WorkflowNode"/>
+		</list>
+		<list name="edges" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`edge_workflow_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workflow_edges_idx`"/>
+			<one-to-many entity-name="Edge"/>
+		</list>
+		<list name="comments" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`comment_workflow_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workflow_comments_idx`"/>
+			<one-to-many entity-name="Comment"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowNodeImpl" entity-name="WorkflowNode" abstract="true" lazy="false" extends="WorkflowElement" table="`workflownode`">
+		<meta attribute="eclassName" inherit="false">WorkflowNode</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflowelement_id`"/>
+		</key>
+		<many-to-one name="workflow" entity-name="Workflow" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="workflownode_workflow" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`workflownode_workflow_id`"/>
+		</many-to-one>
+		<list name="outputs" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`outputport_node_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workflownode_outputs_idx`"/>
+			<one-to-many entity-name="OutputPort"/>
+		</list>
+		<list name="inputs" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`inputport_node_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workflownode_inputs_idx`"/>
+			<one-to-many entity-name="InputPort"/>
+		</list>
+		<property name="isStart" lazy="false" insert="true" update="true" not-null="true" unique="false" type="boolean">
+			<column not-null="true" unique="false" name="`isstart`"/>
+		</property>
+		<property name="isFinish" lazy="false" insert="true" update="true" not-null="true" unique="false" type="boolean">
+			<column not-null="true" unique="false" name="`isfinish`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.EdgeImpl" entity-name="Edge" abstract="false" lazy="false" extends="WorkflowElement" table="`edge`">
+		<meta attribute="eclassName" inherit="false">Edge</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflowelement_id`"/>
+		</key>
+		<many-to-one name="workflow" entity-name="Workflow" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="edge_workflow" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`edge_workflow_id`"/>
+		</many-to-one>
+		<many-to-one name="target" entity-name="InputPort" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="edge_target" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`edge_target_id`"/>
+		</many-to-one>
+		<many-to-one name="source" entity-name="OutputPort" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="edge_source" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`edge_source_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.PortImpl" entity-name="Port" abstract="true" lazy="false" extends="WorkflowElement" table="`port`">
+		<meta attribute="eclassName" inherit="false">Port</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflowelement_id`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.InputPortImpl" entity-name="InputPort" abstract="false" lazy="false" extends="Port" table="`inputport`">
+		<meta attribute="eclassName" inherit="false">InputPort</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`port_id`"/>
+		</key>
+		<many-to-one name="node" entity-name="WorkflowNode" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="inputport_node" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`inputport_node_id`"/>
+		</many-to-one>
+		<list name="edges" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`edge_target_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`inputport_edges_idx`"/>
+			<one-to-many entity-name="Edge"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.OutputPortImpl" entity-name="OutputPort" abstract="false" lazy="false" extends="Port" table="`outputport`">
+		<meta attribute="eclassName" inherit="false">OutputPort</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`port_id`"/>
+		</key>
+		<many-to-one name="node" entity-name="WorkflowNode" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="outputport_node" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`outputport_node_id`"/>
+		</many-to-one>
+		<list name="edges" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`edge_source_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`outputport_edges_idx`"/>
+			<one-to-many entity-name="Edge"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.FaultImpl" entity-name="Fault" abstract="false" lazy="false" extends="OutputPort" table="`fault`">
+		<meta attribute="eclassName" inherit="false">Fault</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`outputport_id`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.CompoundTaskImpl" entity-name="CompoundTask" abstract="false" lazy="false" extends="WorkflowNode" table="`compoundtask`">
+		<meta attribute="eclassName" inherit="false">CompoundTask</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflownode_id`"/>
+		</key>
+		<many-to-one name="subworkflow" entity-name="Workflow" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="compoundtask_subworkflow" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`workflow_subworkflow_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.TransformationTaskImpl" entity-name="TransformationTask" abstract="false" lazy="false" extends="WorkflowNode" table="`transformationtask`">
+		<meta attribute="eclassName" inherit="false">TransformationTask</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflownode_id`"/>
+		</key>
+		<property name="transformExpression" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`transformexpression`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.ConditionalTaskImpl" entity-name="ConditionalTask" abstract="false" lazy="false" extends="WorkflowNode" table="`conditionaltask`">
+		<meta attribute="eclassName" inherit="false">ConditionalTask</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflownode_id`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.LoopTaskImpl" entity-name="LoopTask" abstract="false" lazy="false" extends="CompoundTask" table="`looptask`">
+		<meta attribute="eclassName" inherit="false">LoopTask</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`compoundtask_id`"/>
+		</key>
+		<property name="whileCondition" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`whilecondition`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.ConditionalOutputPortImpl" entity-name="ConditionalOutputPort" abstract="false" lazy="false" extends="OutputPort" table="`conditionaloutputport`">
+		<meta attribute="eclassName" inherit="false">ConditionalOutputPort</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`outputport_id`"/>
+		</key>
+		<property name="condition" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`condition`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.CommentImpl" entity-name="Comment" abstract="false" lazy="false" extends="WorkflowElement" table="`comment`">
+		<meta attribute="eclassName" inherit="false">Comment</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflowelement_id`"/>
+		</key>
+		<many-to-one name="workflow" entity-name="Workflow" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="comment_workflow" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`comment_workflow_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.TaskImpl" entity-name="Task" abstract="false" lazy="false" extends="WorkflowNode" table="`task`">
+		<meta attribute="eclassName" inherit="false">Task</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflownode_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/WorkFlowAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/WorkFlowAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..740acf1bd
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/WorkFlowAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,219 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowElementImpl" entity-name="WorkflowElement" abstract="true" lazy="false" table="`workflowelement`">
+		<meta attribute="eclassName" inherit="false">WorkflowElement</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`"/>
+		</property>
+		<property name="x" 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>
+		<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>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowImpl" entity-name="Workflow" abstract="false" lazy="false" extends="WorkflowElement" table="`workflow`">
+		<meta attribute="eclassName" inherit="false">Workflow</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflowelement_id`"/>
+		</key>
+		<list name="nodes" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`workflownode_workflow_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workflow_nodes_idx`"/>
+			<one-to-many entity-name="WorkflowNode"/>
+		</list>
+		<list name="edges" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`edge_workflow_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workflow_edges_idx`"/>
+			<one-to-many entity-name="Edge"/>
+		</list>
+		<list name="comments" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`comment_workflow_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workflow_comments_idx`"/>
+			<one-to-many entity-name="Comment"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.WorkflowNodeImpl" entity-name="WorkflowNode" abstract="true" lazy="false" extends="WorkflowElement" table="`workflownode`">
+		<meta attribute="eclassName" inherit="false">WorkflowNode</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflowelement_id`"/>
+		</key>
+		<many-to-one name="workflow" entity-name="Workflow" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="workflownode_workflow" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`workflownode_workflow_id`"/>
+		</many-to-one>
+		<list name="outputs" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`outputport_node_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workflownode_outputs_idx`"/>
+			<one-to-many entity-name="OutputPort"/>
+		</list>
+		<list name="inputs" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`inputport_node_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`workflownode_inputs_idx`"/>
+			<one-to-many entity-name="InputPort"/>
+		</list>
+		<property name="isStart" lazy="false" insert="true" update="true" not-null="true" unique="false" type="boolean">
+			<column not-null="true" unique="false" name="`isstart`"/>
+		</property>
+		<property name="isFinish" lazy="false" insert="true" update="true" not-null="true" unique="false" type="boolean">
+			<column not-null="true" unique="false" name="`isfinish`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.EdgeImpl" entity-name="Edge" abstract="false" lazy="false" extends="WorkflowElement" table="`edge`">
+		<meta attribute="eclassName" inherit="false">Edge</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflowelement_id`"/>
+		</key>
+		<many-to-one name="workflow" entity-name="Workflow" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="edge_workflow" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`edge_workflow_id`"/>
+		</many-to-one>
+		<many-to-one name="target" entity-name="InputPort" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="edge_target" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`edge_target_id`"/>
+		</many-to-one>
+		<many-to-one name="source" entity-name="OutputPort" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="edge_source" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`edge_source_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.PortImpl" entity-name="Port" abstract="true" lazy="false" extends="WorkflowElement" table="`port`">
+		<meta attribute="eclassName" inherit="false">Port</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflowelement_id`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.InputPortImpl" entity-name="InputPort" abstract="false" lazy="false" extends="Port" table="`inputport`">
+		<meta attribute="eclassName" inherit="false">InputPort</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`port_id`"/>
+		</key>
+		<many-to-one name="node" entity-name="WorkflowNode" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="inputport_node" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`inputport_node_id`"/>
+		</many-to-one>
+		<list name="edges" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`edge_target_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`inputport_edges_idx`"/>
+			<one-to-many entity-name="Edge"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.OutputPortImpl" entity-name="OutputPort" abstract="false" lazy="false" extends="Port" table="`outputport`">
+		<meta attribute="eclassName" inherit="false">OutputPort</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`port_id`"/>
+		</key>
+		<many-to-one name="node" entity-name="WorkflowNode" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="outputport_node" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`outputport_node_id`"/>
+		</many-to-one>
+		<list name="edges" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`edge_source_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`outputport_edges_idx`"/>
+			<one-to-many entity-name="Edge"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.FaultImpl" entity-name="Fault" abstract="false" lazy="false" extends="OutputPort" table="`fault`">
+		<meta attribute="eclassName" inherit="false">Fault</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`outputport_id`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.CompoundTaskImpl" entity-name="CompoundTask" abstract="false" lazy="false" extends="WorkflowNode" table="`compoundtask`">
+		<meta attribute="eclassName" inherit="false">CompoundTask</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflownode_id`"/>
+		</key>
+		<many-to-one name="subworkflow" entity-name="Workflow" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="compoundtask_subworkflow" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`workflow_subworkflow_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.TransformationTaskImpl" entity-name="TransformationTask" abstract="false" lazy="false" extends="WorkflowNode" table="`transformationtask`">
+		<meta attribute="eclassName" inherit="false">TransformationTask</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflownode_id`"/>
+		</key>
+		<property name="transformExpression" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`transformexpression`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.ConditionalTaskImpl" entity-name="ConditionalTask" abstract="false" lazy="false" extends="WorkflowNode" table="`conditionaltask`">
+		<meta attribute="eclassName" inherit="false">ConditionalTask</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflownode_id`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.LoopTaskImpl" entity-name="LoopTask" abstract="false" lazy="false" extends="CompoundTask" table="`looptask`">
+		<meta attribute="eclassName" inherit="false">LoopTask</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`compoundtask_id`"/>
+		</key>
+		<property name="whileCondition" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`whilecondition`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.ConditionalOutputPortImpl" entity-name="ConditionalOutputPort" abstract="false" lazy="false" extends="OutputPort" table="`conditionaloutputport`">
+		<meta attribute="eclassName" inherit="false">ConditionalOutputPort</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`outputport_id`"/>
+		</key>
+		<property name="condition" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`condition`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.CommentImpl" entity-name="Comment" abstract="false" lazy="false" extends="WorkflowElement" table="`comment`">
+		<meta attribute="eclassName" inherit="false">Comment</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflowelement_id`"/>
+		</key>
+		<many-to-one name="workflow" entity-name="Workflow" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="comment_workflow" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`comment_workflow_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.sample.workflow.impl.TaskImpl" entity-name="Task" abstract="false" lazy="false" extends="WorkflowNode" table="`task`">
+		<meta attribute="eclassName" inherit="false">Task</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta>
+		<key>
+			<column name="`workflownode_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/AnyTypeAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/AnyTypeAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..33e37fcec
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/AnyTypeAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,158 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.AImpl" entity-name="A" abstract="false" lazy="false" table="`a`">
+		<meta attribute="eclassName">A</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/anytype</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="doub" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`doub`"/>
+		</property>
+		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`lon`"/>
+		</property>
+		<many-to-one name="myB" entity-name="B" cascade="merge,persist,save-update,lock,refresh" foreign-key="a_myb" lazy="false" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`b_myb_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.BImpl" entity-name="B" abstract="false" lazy="false" table="`b`">
+		<meta attribute="eclassName">B</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/anytype</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.TestAnyImpl" entity-name="TestAny" abstract="false" lazy="false" table="`testany`">
+		<meta attribute="eclassName">TestAny</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/anytype</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<any name="singleAnyType" id-type="long" cascade="all">
+			<column not-null="false" unique="false" name="`singleanytype_type`"/>
+			<column not-null="false" unique="false" name="`singleanytype_id`"/>
+		</any>
+		<list name="multiAnyType" table="`testany_multianytype`" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="testany_multianytype">
+				<column name="`testany_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`testany_multianytype_idx`"/>
+			<many-to-any id-type="long">
+				<column not-null="true" unique="false" name="`multianytype_type`"/>
+				<column not-null="true" unique="false" name="`multianytype_id`"/>
+			</many-to-any>
+		</list>
+		<list name="myAny" table="`testany_myany`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`testany_myany_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`testany_myany_idx`"/>
+			<one-to-many entity-name="TestAny_myAny"/>
+		</list>
+		<list name="any" table="`testany_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`testany_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`testany_any_idx`"/>
+			<one-to-many entity-name="TestAny_any"/>
+		</list>
+	</class>
+	<class entity-name="TestAny_myAny" lazy="false" table="`testany_myany`">
+		<meta attribute="featureMap">TestAny</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`myany_name`"/>
+		</property>
+		<any name="singleAnyType" id-type="long" cascade="all">
+			<column not-null="false" unique="false" name="`myany_`myany_singleanytype_type``"/>
+			<column not-null="false" unique="false" name="`myany_`myany_singleanytype_id``"/>
+		</any>
+		<list name="multiAnyType" table="`myany_testany_multianytype`" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="testany_multianytype">
+				<column name="`myany_testany_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`myany_testany_multianytype_idx`"/>
+			<many-to-any id-type="long">
+				<column not-null="true" unique="false" name="`myany_`myany_multianytype_type``"/>
+				<column not-null="true" unique="false" name="`myany_`myany_multianytype_id``"/>
+			</many-to-any>
+		</list>
+		<list name="any" table="`myany_testany_any`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`myany_testany_any_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`myany_testany_any_idx`"/>
+			<one-to-many entity-name="TestAny_any"/>
+		</list>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="TestAny_any" lazy="false" table="`testany_any`">
+		<meta attribute="featureMap">TestAny</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`any_name`"/>
+		</property>
+		<any name="singleAnyType" id-type="long" cascade="all">
+			<column not-null="false" unique="false" name="`any_`any_singleanytype_type``"/>
+			<column not-null="false" unique="false" name="`any_`any_singleanytype_id``"/>
+		</any>
+		<list name="multiAnyType" table="`any_testany_multianytype`" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="testany_multianytype">
+				<column name="`any_testany_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`any_testany_multianytype_idx`"/>
+			<many-to-any id-type="long">
+				<column not-null="true" unique="false" name="`any_`any_multianytype_type``"/>
+				<column not-null="true" unique="false" name="`any_`any_multianytype_id``"/>
+			</many-to-any>
+		</list>
+		<list name="myAny" table="`any_testany_myany`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`any_testany_myany_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`any_testany_myany_idx`"/>
+			<one-to-many entity-name="TestAny_myAny"/>
+		</list>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0f4816341
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,25 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl.TestDateImpl" entity-name="TestDate" abstract="false" lazy="false" discriminator-value="TestDate" table="`testdate`">
+		<meta attribute="eclassName">TestDate</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/datetime</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 type="string">
+			<column name="dtype" index="testdatedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="date" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="true" unique="false" name="`date`"/>
+		</property>
+		<property name="datetime" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDateTime">
+			<column not-null="true" unique="false" name="`datetime`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6ea4c6528
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,22 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl.TestDateImpl" entity-name="TestDate" abstract="false" lazy="false" table="`testdate`">
+		<meta attribute="eclassName">TestDate</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/datetime</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="date" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="true" unique="false" name="`date`"/>
+		</property>
+		<property name="datetime" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDateTime">
+			<column not-null="true" unique="false" name="`datetime`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6ea4c6528
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,22 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl.TestDateImpl" entity-name="TestDate" abstract="false" lazy="false" table="`testdate`">
+		<meta attribute="eclassName">TestDate</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/datetime</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="date" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="true" unique="false" name="`date`"/>
+		</property>
+		<property name="datetime" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDateTime">
+			<column not-null="true" unique="false" name="`datetime`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ffef8e88e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,76 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.ComplexTypeImpl" entity-name="ComplexType" abstract="false" lazy="false" discriminator-value="ComplexType" table="`complextype`">
+		<meta attribute="eclassName">ComplexType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentroot</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 type="string">
+			<column name="dtype" index="complextypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="test" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.DocumentRootImpl" entity-name="documentroot.DocumentRoot" abstract="false" lazy="false" discriminator-value="documentroot.DocumentRoot" table="`documentroot_documentroot`">
+		<meta attribute="eclassName">DocumentRoot</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentroot</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 type="string">
+			<column name="dtype" index="documentroot_documentrootdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="mixed" table="`documentroot_documentroot_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`documentroot_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`documentroot_mixed_idx`"/>
+			<one-to-many entity-name="DocumentRoot_mixed"/>
+		</list>
+	</class>
+	<class entity-name="DocumentRoot_mixed" lazy="false" table="`documentroot_mixed`">
+		<meta attribute="featureMap">documentroot.DocumentRoot</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<map name="xMLNSPrefixMap" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_documentroot_xmlnsprefixmap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<map name="xSISchemaLocation" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_documentroot_xsischemalocation_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<property name="otherTest" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_othertest`"/>
+		</property>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_test`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..345e08799
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,70 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.ComplexTypeImpl" entity-name="ComplexType" abstract="false" lazy="false" table="`complextype`">
+		<meta attribute="eclassName">ComplexType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentroot</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="test" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.DocumentRootImpl" entity-name="documentroot.DocumentRoot" abstract="false" lazy="false" table="`documentroot_documentroot`">
+		<meta attribute="eclassName">DocumentRoot</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentroot</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="mixed" table="`documentroot_documentroot_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`documentroot_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`documentroot_mixed_idx`"/>
+			<one-to-many entity-name="DocumentRoot_mixed"/>
+		</list>
+	</class>
+	<class entity-name="DocumentRoot_mixed" lazy="false" table="`documentroot_mixed`">
+		<meta attribute="featureMap">documentroot.DocumentRoot</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<map name="xMLNSPrefixMap" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_documentroot_xmlnsprefixmap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<map name="xSISchemaLocation" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_documentroot_xsischemalocation_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<property name="otherTest" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_othertest`"/>
+		</property>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_test`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..345e08799
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,70 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.ComplexTypeImpl" entity-name="ComplexType" abstract="false" lazy="false" table="`complextype`">
+		<meta attribute="eclassName">ComplexType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentroot</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="test" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.DocumentRootImpl" entity-name="documentroot.DocumentRoot" abstract="false" lazy="false" table="`documentroot_documentroot`">
+		<meta attribute="eclassName">DocumentRoot</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentroot</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="mixed" table="`documentroot_documentroot_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`documentroot_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`documentroot_mixed_idx`"/>
+			<one-to-many entity-name="DocumentRoot_mixed"/>
+		</list>
+	</class>
+	<class entity-name="DocumentRoot_mixed" lazy="false" table="`documentroot_mixed`">
+		<meta attribute="featureMap">documentroot.DocumentRoot</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<map name="xMLNSPrefixMap" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_documentroot_xmlnsprefixmap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<map name="xSISchemaLocation" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_documentroot_xsischemalocation_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<property name="otherTest" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_othertest`"/>
+		</property>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_test`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..5f366773f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,28 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.duration.impl.DurationTestImpl" entity-name="DurationTest" abstract="false" lazy="false" discriminator-value="DurationTest" table="`durationtest`">
+		<meta attribute="eclassName">DurationTest</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/duration</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="durationtestdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="duration" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDuration">
+			<column not-null="false" unique="false" name="`duration`"/>
+		</property>
+		<list name="durations" table="`durationtest_durations`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`durationtest_durations_name`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`durationtest_durations_idx`"/>
+			<element type="org.eclipse.emf.teneo.hibernate.mapping.XSDDuration"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6deb20c4c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,25 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.duration.impl.DurationTestImpl" entity-name="DurationTest" abstract="false" lazy="false" table="`durationtest`">
+		<meta attribute="eclassName">DurationTest</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/duration</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="duration" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDuration">
+			<column not-null="false" unique="false" name="`duration`"/>
+		</property>
+		<list name="durations" table="`durationtest_durations`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`durationtest_durations_name`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`durationtest_durations_idx`"/>
+			<element type="org.eclipse.emf.teneo.hibernate.mapping.XSDDuration"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6deb20c4c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,25 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.duration.impl.DurationTestImpl" entity-name="DurationTest" abstract="false" lazy="false" table="`durationtest`">
+		<meta attribute="eclassName">DurationTest</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/duration</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="duration" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDuration">
+			<column not-null="false" unique="false" name="`duration`"/>
+		</property>
+		<list name="durations" table="`durationtest_durations`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`durationtest_durations_name`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`durationtest_durations_idx`"/>
+			<element type="org.eclipse.emf.teneo.hibernate.mapping.XSDDuration"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..53627f778
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,77 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<map name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_writers">
+				<column name="`book_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<one-to-many entity-name="Writer"/>
+		</map>
+		<map name="keyWords" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`book_keywords_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<map name="cityByWriter" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`book_citybywriter_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key-many-to-many entity-name="Writer"/>
+			<element type="java.lang.String"/>
+		</map>
+		<map name="categoryByDate" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`book_categorybydate_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="timestamp"/>
+			<element>
+				<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+					<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
+					<param name="eclassifier">Category</param>
+					<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+				</type>
+			</element>
+		</map>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..70d20ce12
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,71 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<map name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_writers">
+				<column name="`book_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<one-to-many entity-name="Writer"/>
+		</map>
+		<map name="keyWords" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`book_keywords_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<map name="cityByWriter" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`book_citybywriter_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key-many-to-many entity-name="Writer"/>
+			<element type="java.lang.String"/>
+		</map>
+		<map name="categoryByDate" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`book_categorybydate_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="timestamp"/>
+			<element>
+				<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+					<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
+					<param name="eclassifier">Category</param>
+					<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+				</type>
+			</element>
+		</map>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..70d20ce12
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,71 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<map name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_writers">
+				<column name="`book_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<one-to-many entity-name="Writer"/>
+		</map>
+		<map name="keyWords" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`book_keywords_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="java.lang.String"/>
+		</map>
+		<map name="cityByWriter" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`book_citybywriter_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key-many-to-many entity-name="Writer"/>
+			<element type="java.lang.String"/>
+		</map>
+		<map name="categoryByDate" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`book_categorybydate_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="timestamp"/>
+			<element>
+				<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+					<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
+					<param name="eclassifier">Category</param>
+					<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+				</type>
+			</element>
+		</map>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f2d449df0
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,156 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_writers">
+				<column name="`book_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_writers_idx`"/>
+			<one-to-many entity-name="StringToWriterMapEntry"/>
+		</list>
+		<list name="keyWords" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_keywords">
+				<column name="`book_keywords_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_keywords_idx`"/>
+			<one-to-many entity-name="StringToStringMapEntry"/>
+		</list>
+		<list name="cityByWriter" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_citybywriter">
+				<column name="`book_citybywriter_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_citybywriter_idx`"/>
+			<one-to-many entity-name="WriterToStringMapEntry"/>
+		</list>
+		<list name="categoryByDate" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_categorybydate">
+				<column name="`book_categorybydate_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_categorybydate_idx`"/>
+			<one-to-many entity-name="DateToCategoryMapEntry"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.DateToCategoryMapEntryImpl" entity-name="DateToCategoryMapEntry" abstract="false" lazy="false" discriminator-value="DateToCategoryMapEntry" table="`datetocategorymapentry`">
+		<meta attribute="eclassName">DateToCategoryMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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 type="string">
+			<column name="dtype" index="datetocategorymapentrydtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="timestamp">
+			<column not-null="false" unique="false" name="`key`"/>
+		</property>
+		<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.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
+				<param name="eclassifier">Category</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+			</type>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToStringMapEntryImpl" entity-name="StringToStringMapEntry" abstract="false" lazy="false" discriminator-value="StringToStringMapEntry" table="`stringtostringmapentry`">
+		<meta attribute="eclassName">StringToStringMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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 type="string">
+			<column name="dtype" index="stringtostringmapentrydtype" length="255" not-null="true"/>
+		</discriminator>
+		<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>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" discriminator-value="StringToWriterMapEntry" table="`stringtowritermapentry`">
+		<meta attribute="eclassName">StringToWriterMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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 type="string">
+			<column name="dtype" index="stringtowritermapentrydtype" length="255" not-null="true"/>
+		</discriminator>
+		<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>
+		<many-to-one name="value" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="stringtowritermapentry_value" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`writer_value_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" discriminator-value="WriterToStringMapEntry" table="`writertostringmapentry`">
+		<meta attribute="eclassName">WriterToStringMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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 type="string">
+			<column name="dtype" index="writertostringmapentrydtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="key" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="writertostringmapentry_key" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`writer_key_e_id`"/>
+		</many-to-one>
+		<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>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..267bf7c8b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,138 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_writers">
+				<column name="`book_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_writers_idx`"/>
+			<one-to-many entity-name="StringToWriterMapEntry"/>
+		</list>
+		<list name="keyWords" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_keywords">
+				<column name="`book_keywords_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_keywords_idx`"/>
+			<one-to-many entity-name="StringToStringMapEntry"/>
+		</list>
+		<list name="cityByWriter" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_citybywriter">
+				<column name="`book_citybywriter_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_citybywriter_idx`"/>
+			<one-to-many entity-name="WriterToStringMapEntry"/>
+		</list>
+		<list name="categoryByDate" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_categorybydate">
+				<column name="`book_categorybydate_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_categorybydate_idx`"/>
+			<one-to-many entity-name="DateToCategoryMapEntry"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.DateToCategoryMapEntryImpl" entity-name="DateToCategoryMapEntry" abstract="false" lazy="false" table="`datetocategorymapentry`">
+		<meta attribute="eclassName">DateToCategoryMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`key`"/>
+		</property>
+		<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.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
+				<param name="eclassifier">Category</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+			</type>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToStringMapEntryImpl" entity-name="StringToStringMapEntry" abstract="false" lazy="false" table="`stringtostringmapentry`">
+		<meta attribute="eclassName">StringToStringMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="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>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" table="`stringtowritermapentry`">
+		<meta attribute="eclassName">StringToWriterMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`key`"/>
+		</property>
+		<many-to-one name="value" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="stringtowritermapentry_value" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`writer_value_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" table="`writertostringmapentry`">
+		<meta attribute="eclassName">WriterToStringMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="key" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="writertostringmapentry_key" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`writer_key_e_id`"/>
+		</many-to-one>
+		<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>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..267bf7c8b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,138 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+		<param name="edatatype">CategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+		<list name="writers" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_writers">
+				<column name="`book_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_writers_idx`"/>
+			<one-to-many entity-name="StringToWriterMapEntry"/>
+		</list>
+		<list name="keyWords" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_keywords">
+				<column name="`book_keywords_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_keywords_idx`"/>
+			<one-to-many entity-name="StringToStringMapEntry"/>
+		</list>
+		<list name="cityByWriter" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_citybywriter">
+				<column name="`book_citybywriter_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_citybywriter_idx`"/>
+			<one-to-many entity-name="WriterToStringMapEntry"/>
+		</list>
+		<list name="categoryByDate" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="book_categorybydate">
+				<column name="`book_categorybydate_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`book_categorybydate_idx`"/>
+			<one-to-many entity-name="DateToCategoryMapEntry"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.DateToCategoryMapEntryImpl" entity-name="DateToCategoryMapEntry" abstract="false" lazy="false" table="`datetocategorymapentry`">
+		<meta attribute="eclassName">DateToCategoryMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`key`"/>
+		</property>
+		<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.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
+				<param name="eclassifier">Category</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+			</type>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToStringMapEntryImpl" entity-name="StringToStringMapEntry" abstract="false" lazy="false" table="`stringtostringmapentry`">
+		<meta attribute="eclassName">StringToStringMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="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>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" table="`stringtowritermapentry`">
+		<meta attribute="eclassName">StringToWriterMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`key`"/>
+		</property>
+		<many-to-one name="value" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="stringtowritermapentry_value" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`writer_value_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" table="`writertostringmapentry`">
+		<meta attribute="eclassName">WriterToStringMapEntry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</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="key" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="writertostringmapentry_key" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`writer_key_e_id`"/>
+		</many-to-one>
+		<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>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..cf63bdbcb
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,139 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" discriminator-value="Element" table="`element`">
+		<meta attribute="eclassName">Element</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</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 type="string">
+			<column name="dtype" index="elementdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="nameMap" table="`element_namemap`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`element_namemap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`element_namemap_idx`"/>
+			<one-to-many entity-name="Element_nameMap"/>
+		</list>
+	</class>
+	<class entity-name="Element_nameMap" lazy="false" table="`element_namemap`">
+		<meta attribute="featureMap">Element</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="names" entity-name="NameList" lazy="false" cascade="all" foreign-key="element_names" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`namemap_namelist_names_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.FeatureImpl" entity-name="Feature" abstract="false" lazy="false" discriminator-value="Feature" table="`feature`">
+		<meta attribute="eclassName">Feature</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</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 type="string">
+			<column name="dtype" index="featuredtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="aMap" table="`feature_amap`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`feature_amap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`feature_amap_idx`"/>
+			<one-to-many entity-name="Feature_aMap"/>
+		</list>
+	</class>
+	<class entity-name="Feature_aMap" lazy="false" table="`feature_amap`">
+		<meta attribute="featureMap">Feature</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`amap_name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`amap_value`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.MixedImpl" entity-name="Mixed" abstract="false" lazy="false" discriminator-value="Mixed" table="`mixed`">
+		<meta attribute="eclassName">Mixed</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</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 type="string">
+			<column name="dtype" index="mixeddtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="mixed" table="`mixed_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_mixed_idx`"/>
+			<one-to-many entity-name="Mixed_mixed"/>
+		</list>
+	</class>
+	<class entity-name="Mixed_mixed" lazy="false" table="`mixed_mixed`">
+		<meta attribute="featureMap">Mixed</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`mixed_name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`mixed_value`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.NameListImpl" entity-name="NameList" abstract="false" lazy="false" discriminator-value="NameList" table="`namelist`">
+		<meta attribute="eclassName">NameList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</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 type="string">
+			<column name="dtype" index="namelistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="firstName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`firstname`"/>
+		</property>
+		<property name="middleName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`middlename`"/>
+		</property>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`lastname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..066511834
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,127 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" table="`element`">
+		<meta attribute="eclassName">Element</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</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="nameMap" table="`element_namemap`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`element_namemap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`element_namemap_idx`"/>
+			<one-to-many entity-name="Element_nameMap"/>
+		</list>
+	</class>
+	<class entity-name="Element_nameMap" lazy="false" table="`element_namemap`">
+		<meta attribute="featureMap">Element</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="names" entity-name="NameList" lazy="false" cascade="all" foreign-key="element_names" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`namemap_namelist_names_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.FeatureImpl" entity-name="Feature" abstract="false" lazy="false" table="`feature`">
+		<meta attribute="eclassName">Feature</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</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="aMap" table="`feature_amap`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`feature_amap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`feature_amap_idx`"/>
+			<one-to-many entity-name="Feature_aMap"/>
+		</list>
+	</class>
+	<class entity-name="Feature_aMap" lazy="false" table="`feature_amap`">
+		<meta attribute="featureMap">Feature</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`amap_name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`amap_value`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.MixedImpl" entity-name="Mixed" abstract="false" lazy="false" table="`mixed`">
+		<meta attribute="eclassName">Mixed</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</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="mixed" table="`mixed_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_mixed_idx`"/>
+			<one-to-many entity-name="Mixed_mixed"/>
+		</list>
+	</class>
+	<class entity-name="Mixed_mixed" lazy="false" table="`mixed_mixed`">
+		<meta attribute="featureMap">Mixed</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`mixed_name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`mixed_value`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.NameListImpl" entity-name="NameList" abstract="false" lazy="false" table="`namelist`">
+		<meta attribute="eclassName">NameList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</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="firstName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`firstname`"/>
+		</property>
+		<property name="middleName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`middlename`"/>
+		</property>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`lastname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..066511834
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,127 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" table="`element`">
+		<meta attribute="eclassName">Element</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</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="nameMap" table="`element_namemap`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`element_namemap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`element_namemap_idx`"/>
+			<one-to-many entity-name="Element_nameMap"/>
+		</list>
+	</class>
+	<class entity-name="Element_nameMap" lazy="false" table="`element_namemap`">
+		<meta attribute="featureMap">Element</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="names" entity-name="NameList" lazy="false" cascade="all" foreign-key="element_names" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`namemap_namelist_names_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.FeatureImpl" entity-name="Feature" abstract="false" lazy="false" table="`feature`">
+		<meta attribute="eclassName">Feature</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</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="aMap" table="`feature_amap`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`feature_amap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`feature_amap_idx`"/>
+			<one-to-many entity-name="Feature_aMap"/>
+		</list>
+	</class>
+	<class entity-name="Feature_aMap" lazy="false" table="`feature_amap`">
+		<meta attribute="featureMap">Feature</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`amap_name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`amap_value`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.MixedImpl" entity-name="Mixed" abstract="false" lazy="false" table="`mixed`">
+		<meta attribute="eclassName">Mixed</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</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="mixed" table="`mixed_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_mixed_idx`"/>
+			<one-to-many entity-name="Mixed_mixed"/>
+		</list>
+	</class>
+	<class entity-name="Mixed_mixed" lazy="false" table="`mixed_mixed`">
+		<meta attribute="featureMap">Mixed</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`mixed_name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`mixed_value`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.NameListImpl" entity-name="NameList" abstract="false" lazy="false" table="`namelist`">
+		<meta attribute="eclassName">NameList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</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="firstName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`firstname`"/>
+		</property>
+		<property name="middleName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`middlename`"/>
+		</property>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`lastname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_hsqldb_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..472a6b8f7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_hsqldb_e_o_hibernate.hbm.xml
@@ -0,0 +1,129 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName" inherit="false">Address</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" table="`addresslist`">
+		<meta attribute="eclassName" inherit="false">AddressList</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="firstAddress" entity-name="FirstAddressHolder" lazy="false" cascade="all" foreign-key="addresslist_firstaddress" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`firstaddressholder_firstaddress_e_id`"/>
+		</many-to-one>
+		<list name="secondAddress" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="addresslist_secondaddress">
+				<column name="`addresslist_secondaddress_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`addresslist_secondaddress_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName" inherit="false">UKAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+		<property name="exportCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`exportcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName" inherit="false">DistrictUKAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<key>
+			<column name="`ukaddress_e_id`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl" entity-name="FirstAddressHolder" abstract="false" lazy="false" table="`firstaddressholder`">
+		<meta attribute="eclassName" inherit="false">FirstAddressHolder</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="value" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="firstaddressholder_value">
+				<column name="`firstaddressholder_value_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`firstaddressholder_value_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" table="`internationalprice`">
+		<meta attribute="eclassName" inherit="false">InternationalPrice</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
+		<meta attribute="eclassName" inherit="false">USAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_hsqldb_h_o_hibernate.hbm.xml
new file mode 100755
index 000000000..659f3d67b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_hsqldb_h_o_hibernate.hbm.xml
@@ -0,0 +1,132 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`">
+		<meta attribute="eclassName" inherit="false">Address</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" discriminator-value="AddressList" table="`addresslist`">
+		<meta attribute="eclassName" inherit="false">AddressList</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="addresslistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="firstAddress" entity-name="FirstAddressHolder" lazy="false" cascade="all" foreign-key="addresslist_firstaddress" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`firstaddressholder_firstaddress_e_id`"/>
+		</many-to-one>
+		<list name="secondAddress" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="addresslist_secondaddress">
+				<column name="`addresslist_secondaddress_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`addresslist_secondaddress_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" discriminator-value="UKAddress">
+		<meta attribute="eclassName" inherit="false">UKAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`postcode`"/>
+		</property>
+		<property name="exportCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`exportcode`"/>
+		</property>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" discriminator-value="DistrictUKAddress">
+		<meta attribute="eclassName" inherit="false">DistrictUKAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl" entity-name="FirstAddressHolder" abstract="false" lazy="false" discriminator-value="FirstAddressHolder" table="`firstaddressholder`">
+		<meta attribute="eclassName" inherit="false">FirstAddressHolder</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="firstaddressholderdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="value" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="firstaddressholder_value">
+				<column name="`firstaddressholder_value_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`firstaddressholder_value_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" discriminator-value="InternationalPrice" table="`internationalprice`">
+		<meta attribute="eclassName" inherit="false">InternationalPrice</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="internationalpricedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress">
+		<meta attribute="eclassName" inherit="false">USAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f97598d3c
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,132 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</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 type="string">
+			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" discriminator-value="AddressList" table="`addresslist`">
+		<meta attribute="eclassName">AddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</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 type="string">
+			<column name="dtype" index="addresslistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="firstAddress" entity-name="FirstAddressHolder" lazy="false" cascade="all" foreign-key="addresslist_firstaddress" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`firstaddressholder_firstaddress_e_id`"/>
+		</many-to-one>
+		<list name="secondAddress" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="addresslist_secondaddress">
+				<column name="`addresslist_secondaddress_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`addresslist_secondaddress_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" discriminator-value="UKAddress">
+		<meta attribute="eclassName">UKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`postcode`"/>
+		</property>
+		<property name="exportCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`exportcode`"/>
+		</property>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" discriminator-value="DistrictUKAddress">
+		<meta attribute="eclassName">DistrictUKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl" entity-name="FirstAddressHolder" abstract="false" lazy="false" discriminator-value="FirstAddressHolder" table="`firstaddressholder`">
+		<meta attribute="eclassName">FirstAddressHolder</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</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 type="string">
+			<column name="dtype" index="firstaddressholderdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="value" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="firstaddressholder_value">
+				<column name="`firstaddressholder_value_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`firstaddressholder_value_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" discriminator-value="InternationalPrice" table="`internationalprice`">
+		<meta attribute="eclassName">InternationalPrice</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</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 type="string">
+			<column name="dtype" index="internationalpricedtype" length="255" not-null="true"/>
+		</discriminator>
+		<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" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8711fbfb4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,129 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" table="`addresslist`">
+		<meta attribute="eclassName">AddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="firstAddress" entity-name="FirstAddressHolder" lazy="false" cascade="all" foreign-key="addresslist_firstaddress" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`firstaddressholder_firstaddress_e_id`"/>
+		</many-to-one>
+		<list name="secondAddress" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="addresslist_secondaddress">
+				<column name="`addresslist_secondaddress_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`addresslist_secondaddress_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName">UKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+		<property name="exportCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`exportcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName">DistrictUKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<key>
+			<column name="`ukaddress_e_id`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl" entity-name="FirstAddressHolder" abstract="false" lazy="false" table="`firstaddressholder`">
+		<meta attribute="eclassName">FirstAddressHolder</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</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="value" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="firstaddressholder_value">
+				<column name="`firstaddressholder_value_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`firstaddressholder_value_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" table="`internationalprice`">
+		<meta attribute="eclassName">InternationalPrice</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</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="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8711fbfb4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,129 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" table="`addresslist`">
+		<meta attribute="eclassName">AddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="firstAddress" entity-name="FirstAddressHolder" lazy="false" cascade="all" foreign-key="addresslist_firstaddress" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`firstaddressholder_firstaddress_e_id`"/>
+		</many-to-one>
+		<list name="secondAddress" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="addresslist_secondaddress">
+				<column name="`addresslist_secondaddress_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`addresslist_secondaddress_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName">UKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+		<property name="exportCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`exportcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName">DistrictUKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<key>
+			<column name="`ukaddress_e_id`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl" entity-name="FirstAddressHolder" abstract="false" lazy="false" table="`firstaddressholder`">
+		<meta attribute="eclassName">FirstAddressHolder</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</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="value" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="firstaddressholder_value">
+				<column name="`firstaddressholder_value_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`firstaddressholder_value_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" table="`internationalprice`">
+		<meta attribute="eclassName">InternationalPrice</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</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="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d58b44b67
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,171 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</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 type="string">
+			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="group" table="`address_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`address_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`address_group_idx`"/>
+			<one-to-many entity-name="Address_group"/>
+		</list>
+	</class>
+	<class entity-name="Address_group" lazy="false" table="`address_group`">
+		<meta attribute="featureMap">Address</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`group_name`"/>
+		</property>
+		<property name="longName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_longname`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressGroupImpl" entity-name="AddressGroup" abstract="false" lazy="false" discriminator-value="AddressGroup" table="`addressgroup`">
+		<meta attribute="eclassName">AddressGroup</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</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 type="string">
+			<column name="dtype" index="addressgroupdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`groupname`"/>
+		</property>
+		<many-to-one name="shipTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addressgroup_shipto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_shipto_e_id`"/>
+		</many-to-one>
+		<many-to-one name="billTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addressgroup_billto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_billto_e_id`"/>
+		</many-to-one>
+		<property name="simpleAddress" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`simpleaddress`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" discriminator-value="AddressList" table="`addresslist`">
+		<meta attribute="eclassName">AddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</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 type="string">
+			<column name="dtype" index="addresslistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`groupname`"/>
+		</property>
+		<list name="addrs" table="`addresslist_addrs`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`addresslist_addrs_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`addresslist_addrs_idx`"/>
+			<one-to-many entity-name="AddressList_addrs"/>
+		</list>
+	</class>
+	<class entity-name="AddressList_addrs" lazy="false" table="`addresslist_addrs`">
+		<meta attribute="featureMap">AddressList</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="shipTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addresslist_shipto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`addrs_address_shipto_e_id`"/>
+		</many-to-one>
+		<many-to-one name="billTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addresslist_billto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`addrs_address_billto_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllMapTypeImpl" entity-name="SimpleAllMapType" abstract="false" lazy="false" discriminator-value="SimpleAllMapType" table="`simpleallmaptype`">
+		<meta attribute="eclassName">SimpleAllMapType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</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 type="string">
+			<column name="dtype" index="simpleallmaptypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="allMap" table="`simpleallmaptype_allmap`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simpleallmaptype_allmap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`simpleallmaptype_allmap_idx`"/>
+			<one-to-many entity-name="SimpleAllMapType_allMap"/>
+		</list>
+	</class>
+	<class entity-name="SimpleAllMapType_allMap" lazy="false" table="`simpleallmaptype_allmap`">
+		<meta attribute="featureMap">SimpleAllMapType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="aaa" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`allmap_aaa`"/>
+		</property>
+		<property name="bbb" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`allmap_bbb`"/>
+		</property>
+		<property name="ccc" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`allmap_ccc`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllTypeImpl" entity-name="SimpleAllType" abstract="false" lazy="false" discriminator-value="SimpleAllType" table="`simplealltype`">
+		<meta attribute="eclassName">SimpleAllType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</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 type="string">
+			<column name="dtype" index="simplealltypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="aaa" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`aaa`"/>
+		</property>
+		<property name="bbb" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`bbb`"/>
+		</property>
+		<property name="ccc" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`ccc`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..edaa75805
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,156 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</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="group" table="`address_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`address_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`address_group_idx`"/>
+			<one-to-many entity-name="Address_group"/>
+		</list>
+	</class>
+	<class entity-name="Address_group" lazy="false" table="`address_group`">
+		<meta attribute="featureMap">Address</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`group_name`"/>
+		</property>
+		<property name="longName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_longname`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressGroupImpl" entity-name="AddressGroup" abstract="false" lazy="false" table="`addressgroup`">
+		<meta attribute="eclassName">AddressGroup</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</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="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`groupname`"/>
+		</property>
+		<many-to-one name="shipTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addressgroup_shipto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_shipto_e_id`"/>
+		</many-to-one>
+		<many-to-one name="billTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addressgroup_billto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_billto_e_id`"/>
+		</many-to-one>
+		<property name="simpleAddress" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`simpleaddress`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" table="`addresslist`">
+		<meta attribute="eclassName">AddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</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="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`groupname`"/>
+		</property>
+		<list name="addrs" table="`addresslist_addrs`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`addresslist_addrs_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`addresslist_addrs_idx`"/>
+			<one-to-many entity-name="AddressList_addrs"/>
+		</list>
+	</class>
+	<class entity-name="AddressList_addrs" lazy="false" table="`addresslist_addrs`">
+		<meta attribute="featureMap">AddressList</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="shipTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addresslist_shipto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`addrs_address_shipto_e_id`"/>
+		</many-to-one>
+		<many-to-one name="billTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addresslist_billto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`addrs_address_billto_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllMapTypeImpl" entity-name="SimpleAllMapType" abstract="false" lazy="false" table="`simpleallmaptype`">
+		<meta attribute="eclassName">SimpleAllMapType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</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="allMap" table="`simpleallmaptype_allmap`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simpleallmaptype_allmap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`simpleallmaptype_allmap_idx`"/>
+			<one-to-many entity-name="SimpleAllMapType_allMap"/>
+		</list>
+	</class>
+	<class entity-name="SimpleAllMapType_allMap" lazy="false" table="`simpleallmaptype_allmap`">
+		<meta attribute="featureMap">SimpleAllMapType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="aaa" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`allmap_aaa`"/>
+		</property>
+		<property name="bbb" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`allmap_bbb`"/>
+		</property>
+		<property name="ccc" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`allmap_ccc`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllTypeImpl" entity-name="SimpleAllType" abstract="false" lazy="false" table="`simplealltype`">
+		<meta attribute="eclassName">SimpleAllType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</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="aaa" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`aaa`"/>
+		</property>
+		<property name="bbb" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`bbb`"/>
+		</property>
+		<property name="ccc" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`ccc`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..edaa75805
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,156 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</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="group" table="`address_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`address_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`address_group_idx`"/>
+			<one-to-many entity-name="Address_group"/>
+		</list>
+	</class>
+	<class entity-name="Address_group" lazy="false" table="`address_group`">
+		<meta attribute="featureMap">Address</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`group_name`"/>
+		</property>
+		<property name="longName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_longname`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressGroupImpl" entity-name="AddressGroup" abstract="false" lazy="false" table="`addressgroup`">
+		<meta attribute="eclassName">AddressGroup</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</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="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`groupname`"/>
+		</property>
+		<many-to-one name="shipTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addressgroup_shipto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_shipto_e_id`"/>
+		</many-to-one>
+		<many-to-one name="billTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addressgroup_billto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_billto_e_id`"/>
+		</many-to-one>
+		<property name="simpleAddress" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`simpleaddress`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" table="`addresslist`">
+		<meta attribute="eclassName">AddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</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="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`groupname`"/>
+		</property>
+		<list name="addrs" table="`addresslist_addrs`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`addresslist_addrs_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`addresslist_addrs_idx`"/>
+			<one-to-many entity-name="AddressList_addrs"/>
+		</list>
+	</class>
+	<class entity-name="AddressList_addrs" lazy="false" table="`addresslist_addrs`">
+		<meta attribute="featureMap">AddressList</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="shipTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addresslist_shipto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`addrs_address_shipto_e_id`"/>
+		</many-to-one>
+		<many-to-one name="billTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addresslist_billto" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`addrs_address_billto_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllMapTypeImpl" entity-name="SimpleAllMapType" abstract="false" lazy="false" table="`simpleallmaptype`">
+		<meta attribute="eclassName">SimpleAllMapType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</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="allMap" table="`simpleallmaptype_allmap`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simpleallmaptype_allmap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`simpleallmaptype_allmap_idx`"/>
+			<one-to-many entity-name="SimpleAllMapType_allMap"/>
+		</list>
+	</class>
+	<class entity-name="SimpleAllMapType_allMap" lazy="false" table="`simpleallmaptype_allmap`">
+		<meta attribute="featureMap">SimpleAllMapType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="aaa" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`allmap_aaa`"/>
+		</property>
+		<property name="bbb" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`allmap_bbb`"/>
+		</property>
+		<property name="ccc" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`allmap_ccc`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllTypeImpl" entity-name="SimpleAllType" abstract="false" lazy="false" table="`simplealltype`">
+		<meta attribute="eclassName">SimpleAllType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</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="aaa" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`aaa`"/>
+		</property>
+		<property name="bbb" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`bbb`"/>
+		</property>
+		<property name="ccc" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`ccc`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..77f9d10e4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,43 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="list.SixStatesList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">SixStatesList</param>
+	</typedef>
+	<typedef name="list.StateList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">StateList</param>
+	</typedef>
+	<typedef name="list.StringList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">StringList</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl.statesByCountryImpl" entity-name="statesByCountry" abstract="false" lazy="false" discriminator-value="statesByCountry" table="`statesbycountry`">
+		<meta attribute="eclassName">statesByCountry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</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 type="string">
+			<column name="dtype" index="statesbycountrydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="country" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`country`"/>
+		</property>
+		<property name="index" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`index`"/>
+		</property>
+		<property name="allStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.StateList">
+			<column not-null="true" unique="false" name="`allstates`"/>
+		</property>
+		<property name="sixImportantStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.SixStatesList">
+			<column not-null="true" unique="false" name="`siximportantstates`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..890e59a32
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,40 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="list.SixStatesList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">SixStatesList</param>
+	</typedef>
+	<typedef name="list.StateList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">StateList</param>
+	</typedef>
+	<typedef name="list.StringList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">StringList</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl.statesByCountryImpl" entity-name="statesByCountry" abstract="false" lazy="false" table="`statesbycountry`">
+		<meta attribute="eclassName">statesByCountry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</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="country" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`country`"/>
+		</property>
+		<property name="index" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`index`"/>
+		</property>
+		<property name="allStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.StateList">
+			<column not-null="true" unique="false" name="`allstates`"/>
+		</property>
+		<property name="sixImportantStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.SixStatesList">
+			<column not-null="true" unique="false" name="`siximportantstates`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..890e59a32
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,40 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="list.SixStatesList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">SixStatesList</param>
+	</typedef>
+	<typedef name="list.StateList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">StateList</param>
+	</typedef>
+	<typedef name="list.StringList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
+		<param name="edatatype">StringList</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl.statesByCountryImpl" entity-name="statesByCountry" abstract="false" lazy="false" table="`statesbycountry`">
+		<meta attribute="eclassName">statesByCountry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</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="country" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`country`"/>
+		</property>
+		<property name="index" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`index`"/>
+		</property>
+		<property name="allStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.StateList">
+			<column not-null="true" unique="false" name="`allstates`"/>
+		</property>
+		<property name="sixImportantStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.SixStatesList">
+			<column not-null="true" unique="false" name="`siximportantstates`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListUnionAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListUnionAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..06e5c8476
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListUnionAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,71 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="listunion.SixStatesList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/listunion</param>
+		<param name="edatatype">SixStatesList</param>
+	</typedef>
+	<typedef name="listunion.StateList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/listunion</param>
+		<param name="edatatype">StateList</param>
+	</typedef>
+	<typedef name="listunion.StringList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/listunion</param>
+		<param name="edatatype">StringList</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.impl.statesByCountryImpl" entity-name="statesByCountry" abstract="false" lazy="false" table="`statesbycountry`">
+		<meta attribute="eclassName">statesByCountry</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/listunion</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="country" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`country`"/>
+		</property>
+		<property name="allStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="listunion.StateList">
+			<column not-null="true" unique="false" name="`allstates`"/>
+		</property>
+		<property name="sixImportantStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="listunion.SixStatesList">
+			<column not-null="false" unique="false" name="`siximportantstates`"/>
+		</property>
+		<property name="zipUnion" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`zipunion`"/>
+		</property>
+		<list name="zipUnions" table="`statesbycountry_zipunions`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`statesbycountry_zipunions_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`statesbycountry_zipunions_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+		<property name="simpleUnion" lazy="false" insert="true" update="true" not-null="true" unique="false">
+			<column not-null="true" unique="false" name="`simpleunion`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+				<param name="edatatype">SimpleUnionType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/listunion</param>
+			</type>
+		</property>
+		<list name="simpleUnions" table="`statesbycountry_simpleunions`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`statesbycountry_simpleunions_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`statesbycountry_simpleunions_idx`"/>
+			<element type="java.math.BigInteger,java.lang.String"/>
+		</list>
+		<property name="simpleStringUnion" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`simplestringunion`"/>
+		</property>
+		<list name="simpleStringUnions" table="`statesbycountry_simplestringunions`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`statesbycountry_simplestringunions_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`statesbycountry_simplestringunions_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b567aea79
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,88 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.LetterBodyTypeImpl" entity-name="LetterBodyType" abstract="false" lazy="false" discriminator-value="LetterBodyType" table="`letterbodytype`">
+		<meta attribute="eclassName">LetterBodyType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/mixed</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 type="string">
+			<column name="dtype" index="letterbodytypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="mixed" table="`letterbodytype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`letterbodytype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`letterbodytype_mixed_idx`"/>
+			<one-to-many entity-name="LetterBodyType_mixed"/>
+		</list>
+	</class>
+	<class entity-name="LetterBodyType_mixed" lazy="false" table="`letterbodytype_mixed`">
+		<meta attribute="featureMap">LetterBodyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="salutation" entity-name="SalutationType" lazy="false" cascade="all" foreign-key="letterbodytype_salutation" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_salutationtype_salutation_e_id`"/>
+		</many-to-one>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`mixed_quantity`"/>
+		</property>
+		<property name="productName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_productname`"/>
+		</property>
+		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`mixed_shipdate`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.SalutationTypeImpl" entity-name="SalutationType" abstract="false" lazy="false" discriminator-value="SalutationType" table="`salutationtype`">
+		<meta attribute="eclassName">SalutationType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/mixed</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 type="string">
+			<column name="dtype" index="salutationtypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="mixed" table="`salutationtype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`salutationtype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`salutationtype_mixed_idx`"/>
+			<one-to-many entity-name="SalutationType_mixed"/>
+		</list>
+	</class>
+	<class entity-name="SalutationType_mixed" lazy="false" table="`salutationtype_mixed`">
+		<meta attribute="featureMap">SalutationType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`mixed_name`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..70d555973
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,82 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.LetterBodyTypeImpl" entity-name="LetterBodyType" abstract="false" lazy="false" table="`letterbodytype`">
+		<meta attribute="eclassName">LetterBodyType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/mixed</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="mixed" table="`letterbodytype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`letterbodytype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`letterbodytype_mixed_idx`"/>
+			<one-to-many entity-name="LetterBodyType_mixed"/>
+		</list>
+	</class>
+	<class entity-name="LetterBodyType_mixed" lazy="false" table="`letterbodytype_mixed`">
+		<meta attribute="featureMap">LetterBodyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="salutation" entity-name="SalutationType" lazy="false" cascade="all" foreign-key="letterbodytype_salutation" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_salutationtype_salutation_e_id`"/>
+		</many-to-one>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`mixed_quantity`"/>
+		</property>
+		<property name="productName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_productname`"/>
+		</property>
+		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`mixed_shipdate`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.SalutationTypeImpl" entity-name="SalutationType" abstract="false" lazy="false" table="`salutationtype`">
+		<meta attribute="eclassName">SalutationType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/mixed</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="mixed" table="`salutationtype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`salutationtype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`salutationtype_mixed_idx`"/>
+			<one-to-many entity-name="SalutationType_mixed"/>
+		</list>
+	</class>
+	<class entity-name="SalutationType_mixed" lazy="false" table="`salutationtype_mixed`">
+		<meta attribute="featureMap">SalutationType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`mixed_name`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..70d555973
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,82 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.LetterBodyTypeImpl" entity-name="LetterBodyType" abstract="false" lazy="false" table="`letterbodytype`">
+		<meta attribute="eclassName">LetterBodyType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/mixed</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="mixed" table="`letterbodytype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`letterbodytype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`letterbodytype_mixed_idx`"/>
+			<one-to-many entity-name="LetterBodyType_mixed"/>
+		</list>
+	</class>
+	<class entity-name="LetterBodyType_mixed" lazy="false" table="`letterbodytype_mixed`">
+		<meta attribute="featureMap">LetterBodyType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="salutation" entity-name="SalutationType" lazy="false" cascade="all" foreign-key="letterbodytype_salutation" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_salutationtype_salutation_e_id`"/>
+		</many-to-one>
+		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`mixed_quantity`"/>
+		</property>
+		<property name="productName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mixed_productname`"/>
+		</property>
+		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`mixed_shipdate`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.SalutationTypeImpl" entity-name="SalutationType" abstract="false" lazy="false" table="`salutationtype`">
+		<meta attribute="eclassName">SalutationType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/mixed</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="mixed" table="`salutationtype_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`salutationtype_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`salutationtype_mixed_idx`"/>
+			<one-to-many entity-name="SalutationType_mixed"/>
+		</list>
+	</class>
+	<class entity-name="SalutationType_mixed" lazy="false" table="`salutationtype_mixed`">
+		<meta attribute="featureMap">SalutationType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`mixed_name`"/>
+		</property>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ModelGroupAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ModelGroupAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..bef803834
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ModelGroupAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,62 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.modelgroup.impl.OrderListImpl" entity-name="OrderList" abstract="false" lazy="false" table="`orderlist`">
+		<meta attribute="eclassName">OrderList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/modelgroup</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="orders" table="`orderlist_orders`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`orderlist_orders_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`orderlist_orders_idx`"/>
+			<one-to-many entity-name="OrderList_orders"/>
+		</list>
+	</class>
+	<class entity-name="OrderList_orders" lazy="false" table="`orderlist_orders`">
+		<meta attribute="featureMap">OrderList</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="preferredOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="orderlist_preferredorders" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`orders_purchaseorder_preferredorders_e_id`"/>
+		</many-to-one>
+		<many-to-one name="standardOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="orderlist_standardorders" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`orders_purchaseorder_standardorders_e_id`"/>
+		</many-to-one>
+		<property name="hardCopyOrderReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`orders_hardcopyorderreference`"/>
+		</property>
+		<property name="hardCopyOrderNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`orders_hardcopyordernumber`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.modelgroup.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`">
+		<meta attribute="eclassName">PurchaseOrder</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/modelgroup</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="reference" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`reference`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b1401c955
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,128 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.AImpl" entity-name="A" abstract="false" lazy="false" discriminator-value="A" table="`a`">
+		<meta attribute="eclassName">A</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</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 type="string">
+			<column name="dtype" index="adtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="group" table="`a_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`a_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`a_group_idx`"/>
+			<one-to-many entity-name="A_group"/>
+		</list>
+	</class>
+	<class entity-name="A_group" lazy="false" table="`a_group`">
+		<meta attribute="featureMap">A</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="b" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_b`"/>
+		</property>
+		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="a_c" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_ctype_c_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.CTypeImpl" entity-name="CType" abstract="false" lazy="false" discriminator-value="CType" table="`ctype`">
+		<meta attribute="eclassName">CType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</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 type="string">
+			<column name="dtype" index="ctypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="cname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`cname`"/>
+		</property>
+		<property name="cvalue" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`cvalue`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" discriminator-value="Element" table="`element`">
+		<meta attribute="eclassName">Element</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</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 type="string">
+			<column name="dtype" index="elementdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="mixed" table="`element_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`element_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`element_mixed_idx`"/>
+			<one-to-many entity-name="Element_mixed"/>
+		</list>
+	</class>
+	<class entity-name="Element_mixed" lazy="false" table="`element_mixed`">
+		<meta attribute="featureMap">Element</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`mixed_name`"/>
+		</property>
+		<list name="true" table="`mixed_element_true`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_element_true_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_element_true_idx`"/>
+			<one-to-many entity-name="Element_true"/>
+		</list>
+		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="element_c" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_ctype_c_e_id`"/>
+		</many-to-one>
+		<many-to-one name="recursive" entity-name="Element" lazy="false" cascade="all" foreign-key="element_recursive" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_element_recursive_e_id`"/>
+		</many-to-one>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="Element_true" lazy="false" table="`element_true`">
+		<meta attribute="featureMap">Element</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="element_c" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`true_ctype_c_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b1a3153ea
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,119 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.AImpl" entity-name="A" abstract="false" lazy="false" table="`a`">
+		<meta attribute="eclassName">A</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="group" table="`a_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`a_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`a_group_idx`"/>
+			<one-to-many entity-name="A_group"/>
+		</list>
+	</class>
+	<class entity-name="A_group" lazy="false" table="`a_group`">
+		<meta attribute="featureMap">A</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="b" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_b`"/>
+		</property>
+		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="a_c" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_ctype_c_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.CTypeImpl" entity-name="CType" abstract="false" lazy="false" table="`ctype`">
+		<meta attribute="eclassName">CType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</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="cname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`cname`"/>
+		</property>
+		<property name="cvalue" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`cvalue`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" table="`element`">
+		<meta attribute="eclassName">Element</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</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="mixed" table="`element_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`element_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`element_mixed_idx`"/>
+			<one-to-many entity-name="Element_mixed"/>
+		</list>
+	</class>
+	<class entity-name="Element_mixed" lazy="false" table="`element_mixed`">
+		<meta attribute="featureMap">Element</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`mixed_name`"/>
+		</property>
+		<list name="true" table="`mixed_element_true`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_element_true_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_element_true_idx`"/>
+			<one-to-many entity-name="Element_true"/>
+		</list>
+		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="element_c" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_ctype_c_e_id`"/>
+		</many-to-one>
+		<many-to-one name="recursive" entity-name="Element" lazy="false" cascade="all" foreign-key="element_recursive" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_element_recursive_e_id`"/>
+		</many-to-one>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="Element_true" lazy="false" table="`element_true`">
+		<meta attribute="featureMap">Element</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="element_c" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`true_ctype_c_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b1a3153ea
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,119 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.AImpl" entity-name="A" abstract="false" lazy="false" table="`a`">
+		<meta attribute="eclassName">A</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="group" table="`a_group`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`a_group_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`a_group_idx`"/>
+			<one-to-many entity-name="A_group"/>
+		</list>
+	</class>
+	<class entity-name="A_group" lazy="false" table="`a_group`">
+		<meta attribute="featureMap">A</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="b" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`group_b`"/>
+		</property>
+		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="a_c" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`group_ctype_c_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.CTypeImpl" entity-name="CType" abstract="false" lazy="false" table="`ctype`">
+		<meta attribute="eclassName">CType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</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="cname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`cname`"/>
+		</property>
+		<property name="cvalue" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`cvalue`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" table="`element`">
+		<meta attribute="eclassName">Element</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</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="mixed" table="`element_mixed`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`element_mixed_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`element_mixed_idx`"/>
+			<one-to-many entity-name="Element_mixed"/>
+		</list>
+	</class>
+	<class entity-name="Element_mixed" lazy="false" table="`element_mixed`">
+		<meta attribute="featureMap">Element</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<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="`mixed_name`"/>
+		</property>
+		<list name="true" table="`mixed_element_true`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mixed_element_true_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mixed_element_true_idx`"/>
+			<one-to-many entity-name="Element_true"/>
+		</list>
+		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="element_c" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_ctype_c_e_id`"/>
+		</many-to-one>
+		<many-to-one name="recursive" entity-name="Element" lazy="false" cascade="all" foreign-key="element_recursive" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mixed_element_recursive_e_id`"/>
+		</many-to-one>
+		<property name="fme_mixed_text" type="java.lang.String"/>
+		<property name="fme_mixed_cdata" type="java.lang.String"/>
+		<property name="fme_mixed_comment" type="java.lang.String"/>
+	</class>
+	<class entity-name="Element_true" lazy="false" table="`element_true`">
+		<meta attribute="featureMap">Element</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="element_c" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`true_ctype_c_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ca820900f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,32 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.impl.MytestImpl" entity-name="Mytest" abstract="false" lazy="false" discriminator-value="Mytest" table="`mytest`">
+		<meta attribute="eclassName">Mytest</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/qname</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 type="string">
+			<column name="dtype" index="mytestdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.QNameUserType">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="names" table="`mytest_names`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mytest_names_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`mytest_names_idx`"/>
+			<element type="org.eclipse.emf.teneo.hibernate.mapping.QNameUserType"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9ae61854b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,29 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.impl.MytestImpl" entity-name="Mytest" abstract="false" lazy="false" table="`mytest`">
+		<meta attribute="eclassName">Mytest</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/qname</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="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.QNameUserType">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="names" table="`mytest_names`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mytest_names_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`mytest_names_idx`"/>
+			<element type="org.eclipse.emf.teneo.hibernate.mapping.QNameUserType"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9ae61854b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,29 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.impl.MytestImpl" entity-name="Mytest" abstract="false" lazy="false" table="`mytest`">
+		<meta attribute="eclassName">Mytest</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/qname</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="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`description`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.QNameUserType">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="names" table="`mytest_names`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`mytest_names_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`mytest_names_idx`"/>
+			<element type="org.eclipse.emf.teneo.hibernate.mapping.QNameUserType"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f24483672
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl.XMLDeviantImpl" entity-name="XMLDeviant" abstract="false" lazy="false" discriminator-value="XMLDeviant" table="`xmldeviant`">
+		<meta attribute="eclassName">XMLDeviant</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/restriction</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 type="string">
+			<column name="dtype" index="xmldeviantdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="numPosts" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`numposts`"/>
+		</property>
+		<property name="signature" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`signature`"/>
+		</property>
+		<property name="email" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`email`"/>
+		</property>
+		<property name="firstSubscribed" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`firstsubscribed`"/>
+		</property>
+		<property name="mailReader" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mailreader`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl.MemberImpl" entity-name="Member" abstract="false" lazy="false" extends="XMLDeviant" discriminator-value="Member">
+		<meta attribute="eclassName">Member</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/restriction</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..89e62c9c3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl.XMLDeviantImpl" entity-name="XMLDeviant" abstract="false" lazy="false" table="`xmldeviant`">
+		<meta attribute="eclassName">XMLDeviant</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/restriction</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="numPosts" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`numposts`"/>
+		</property>
+		<property name="signature" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`signature`"/>
+		</property>
+		<property name="email" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`email`"/>
+		</property>
+		<property name="firstSubscribed" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`firstsubscribed`"/>
+		</property>
+		<property name="mailReader" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mailreader`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl.MemberImpl" entity-name="Member" abstract="false" lazy="false" extends="XMLDeviant" table="`member`">
+		<meta attribute="eclassName">Member</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/restriction</meta>
+		<key>
+			<column name="`xmldeviant_e_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..89e62c9c3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl.XMLDeviantImpl" entity-name="XMLDeviant" abstract="false" lazy="false" table="`xmldeviant`">
+		<meta attribute="eclassName">XMLDeviant</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/restriction</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="numPosts" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`numposts`"/>
+		</property>
+		<property name="signature" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`signature`"/>
+		</property>
+		<property name="email" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`email`"/>
+		</property>
+		<property name="firstSubscribed" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`firstsubscribed`"/>
+		</property>
+		<property name="mailReader" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`mailreader`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl.MemberImpl" entity-name="Member" abstract="false" lazy="false" extends="XMLDeviant" table="`member`">
+		<meta attribute="eclassName">Member</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/restriction</meta>
+		<key>
+			<column name="`xmldeviant_e_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fab726101
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,239 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+		<param name="edatatype">SimpleEnumObject</param>
+	</typedef>
+	<typedef name="simpletypes.StringArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+		<param name="edatatype">StringArray</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleListImpl" entity-name="SimpleList" abstract="false" lazy="false" discriminator-value="SimpleList" table="`simplelist`">
+		<meta attribute="eclassName">SimpleList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</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 type="string">
+			<column name="dtype" index="simplelistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`code`"/>
+		</property>
+		<list name="boo" table="`simplelist_boo`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_boo_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_boo_idx`"/>
+			<element type="boolean"/>
+		</list>
+		<list name="byt" table="`simplelist_byt`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_byt_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_byt_idx`"/>
+			<element type="java.lang.Byte"/>
+		</list>
+		<list name="doubl" table="`simplelist_doubl`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_doubl_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_doubl_idx`"/>
+			<element type="java.lang.Double"/>
+		</list>
+		<list name="floa" table="`simplelist_floa`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_floa_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_floa_idx`"/>
+			<element type="java.lang.Float"/>
+		</list>
+		<list name="inte" table="`simplelist_inte`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_inte_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_inte_idx`"/>
+			<element type="java.lang.Integer"/>
+		</list>
+		<list name="long" table="`longnum`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_long_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_long_idx`"/>
+			<element type="java.lang.Long"/>
+		</list>
+		<list name="shor" table="`simplelist_shor`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_shor_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_shor_idx`"/>
+			<element type="short"/>
+		</list>
+		<list name="enu" table="`simplelist_enu`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_enu_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_enu_idx`"/>
+			<element>
+				<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+					<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
+					<param name="eclassifier">SimpleEnum</param>
+					<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+				</type>
+			</element>
+		</list>
+		<list name="dat" table="`simplelist_dat`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_dat_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_dat_idx`"/>
+			<element type="timestamp"/>
+		</list>
+		<list name="limitedstring" table="`simplelist_limitedstring`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_limitedstring_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_limitedstring_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+		<list name="stri" table="`simplelist_stri`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_stri_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_stri_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+		<array name="intArray" table="`simplelist_intarray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_intarray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_intarray_idx`"/>
+			<element type="int"/>
+		</array>
+		<array name="doubleArray" table="`simplelist_doublearray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_doublearray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_doublearray_idx`"/>
+			<element type="double"/>
+		</array>
+		<property name="stringArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.StringArray">
+			<column not-null="true" unique="false" name="`stringarray`"/>
+		</property>
+		<array name="byteArray" table="`simplelist_bytearray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_bytearray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_bytearray_idx`"/>
+			<element type="byte"/>
+		</array>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeImpl" entity-name="SimpleType" abstract="false" lazy="false" discriminator-value="SimpleType" table="`simpletype`">
+		<meta attribute="eclassName">SimpleType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</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 type="string">
+			<column name="dtype" index="simpletypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`code`"/>
+		</property>
+		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`boo`"/>
+		</property>
+		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`byt`"/>
+		</property>
+		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`doubl`"/>
+		</property>
+		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`float`"/>
+		</property>
+		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`inte`"/>
+		</property>
+		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`lon`"/>
+		</property>
+		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="short">
+			<column not-null="false" unique="false" name="`shor`"/>
+		</property>
+		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`enu`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
+				<param name="eclassifier">SimpleEnum</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+			</type>
+		</property>
+		<property name="dat" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`dat`"/>
+		</property>
+		<property name="limitedstring" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`limitedstring`" length="10"/>
+		</property>
+		<property name="limitedDecimal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`limiteddecimal`" precision="4" scale="1"/>
+		</property>
+		<property name="extraLimitedString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`extralimitedstring`" length="5"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeObjectImpl" entity-name="SimpleTypeObject" abstract="false" lazy="false" discriminator-value="SimpleTypeObject" table="`simpletypeobject`">
+		<meta attribute="eclassName">SimpleTypeObject</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</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 type="string">
+			<column name="dtype" index="simpletypeobjectdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`code`"/>
+		</property>
+		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
+			<column not-null="false" unique="false" name="`boo`"/>
+		</property>
+		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Byte">
+			<column not-null="false" unique="false" name="`byt`"/>
+		</property>
+		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Double">
+			<column not-null="false" unique="false" name="`doubl`"/>
+		</property>
+		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Float">
+			<column not-null="false" unique="false" name="`float`"/>
+		</property>
+		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Integer">
+			<column not-null="false" unique="false" name="`inte`"/>
+		</property>
+		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Long">
+			<column not-null="false" unique="false" name="`lon`"/>
+		</property>
+		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Short">
+			<column not-null="false" unique="false" name="`shor`"/>
+		</property>
+		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false" type="simpletypes.SimpleEnumObject">
+			<column not-null="false" unique="false" name="`enu`"/>
+		</property>
+		<property name="dat" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`dat`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ea7280f12
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,230 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+		<param name="edatatype">SimpleEnumObject</param>
+	</typedef>
+	<typedef name="simpletypes.StringArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+		<param name="edatatype">StringArray</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleListImpl" entity-name="SimpleList" abstract="false" lazy="false" table="`simplelist`">
+		<meta attribute="eclassName">SimpleList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</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="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`code`"/>
+		</property>
+		<list name="boo" table="`simplelist_boo`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_boo_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_boo_idx`"/>
+			<element type="boolean"/>
+		</list>
+		<list name="byt" table="`simplelist_byt`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_byt_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_byt_idx`"/>
+			<element type="java.lang.Byte"/>
+		</list>
+		<list name="doubl" table="`simplelist_doubl`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_doubl_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_doubl_idx`"/>
+			<element type="java.lang.Double"/>
+		</list>
+		<list name="floa" table="`simplelist_floa`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_floa_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_floa_idx`"/>
+			<element type="java.lang.Float"/>
+		</list>
+		<list name="inte" table="`simplelist_inte`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_inte_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_inte_idx`"/>
+			<element type="java.lang.Integer"/>
+		</list>
+		<list name="long" table="`longnum`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_long_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_long_idx`"/>
+			<element type="java.lang.Long"/>
+		</list>
+		<list name="shor" table="`simplelist_shor`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_shor_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_shor_idx`"/>
+			<element type="short"/>
+		</list>
+		<list name="enu" table="`simplelist_enu`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_enu_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_enu_idx`"/>
+			<element>
+				<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+					<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
+					<param name="eclassifier">SimpleEnum</param>
+					<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+				</type>
+			</element>
+		</list>
+		<list name="dat" table="`simplelist_dat`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_dat_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_dat_idx`"/>
+			<element type="timestamp"/>
+		</list>
+		<list name="limitedstring" table="`simplelist_limitedstring`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_limitedstring_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_limitedstring_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+		<list name="stri" table="`simplelist_stri`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_stri_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_stri_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+		<array name="intArray" table="`simplelist_intarray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_intarray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_intarray_idx`"/>
+			<element type="int"/>
+		</array>
+		<array name="doubleArray" table="`simplelist_doublearray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_doublearray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_doublearray_idx`"/>
+			<element type="double"/>
+		</array>
+		<property name="stringArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.StringArray">
+			<column not-null="true" unique="false" name="`stringarray`"/>
+		</property>
+		<array name="byteArray" table="`simplelist_bytearray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_bytearray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_bytearray_idx`"/>
+			<element type="byte"/>
+		</array>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeImpl" entity-name="SimpleType" abstract="false" lazy="false" table="`simpletype`">
+		<meta attribute="eclassName">SimpleType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</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="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`code`"/>
+		</property>
+		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`boo`"/>
+		</property>
+		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`byt`"/>
+		</property>
+		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`doubl`"/>
+		</property>
+		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`float`"/>
+		</property>
+		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`inte`"/>
+		</property>
+		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`lon`"/>
+		</property>
+		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="short">
+			<column not-null="false" unique="false" name="`shor`"/>
+		</property>
+		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`enu`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
+				<param name="eclassifier">SimpleEnum</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+			</type>
+		</property>
+		<property name="dat" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`dat`"/>
+		</property>
+		<property name="limitedstring" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`limitedstring`" length="10"/>
+		</property>
+		<property name="limitedDecimal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`limiteddecimal`" precision="4" scale="1"/>
+		</property>
+		<property name="extraLimitedString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`extralimitedstring`" length="5"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeObjectImpl" entity-name="SimpleTypeObject" abstract="false" lazy="false" table="`simpletypeobject`">
+		<meta attribute="eclassName">SimpleTypeObject</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</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="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`code`"/>
+		</property>
+		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
+			<column not-null="false" unique="false" name="`boo`"/>
+		</property>
+		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Byte">
+			<column not-null="false" unique="false" name="`byt`"/>
+		</property>
+		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Double">
+			<column not-null="false" unique="false" name="`doubl`"/>
+		</property>
+		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Float">
+			<column not-null="false" unique="false" name="`float`"/>
+		</property>
+		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Integer">
+			<column not-null="false" unique="false" name="`inte`"/>
+		</property>
+		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Long">
+			<column not-null="false" unique="false" name="`lon`"/>
+		</property>
+		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Short">
+			<column not-null="false" unique="false" name="`shor`"/>
+		</property>
+		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false" type="simpletypes.SimpleEnumObject">
+			<column not-null="false" unique="false" name="`enu`"/>
+		</property>
+		<property name="dat" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`dat`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ea7280f12
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,230 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+		<param name="edatatype">SimpleEnumObject</param>
+	</typedef>
+	<typedef name="simpletypes.StringArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+		<param name="edatatype">StringArray</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleListImpl" entity-name="SimpleList" abstract="false" lazy="false" table="`simplelist`">
+		<meta attribute="eclassName">SimpleList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</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="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`code`"/>
+		</property>
+		<list name="boo" table="`simplelist_boo`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_boo_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_boo_idx`"/>
+			<element type="boolean"/>
+		</list>
+		<list name="byt" table="`simplelist_byt`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_byt_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_byt_idx`"/>
+			<element type="java.lang.Byte"/>
+		</list>
+		<list name="doubl" table="`simplelist_doubl`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_doubl_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_doubl_idx`"/>
+			<element type="java.lang.Double"/>
+		</list>
+		<list name="floa" table="`simplelist_floa`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_floa_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_floa_idx`"/>
+			<element type="java.lang.Float"/>
+		</list>
+		<list name="inte" table="`simplelist_inte`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_inte_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_inte_idx`"/>
+			<element type="java.lang.Integer"/>
+		</list>
+		<list name="long" table="`longnum`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_long_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_long_idx`"/>
+			<element type="java.lang.Long"/>
+		</list>
+		<list name="shor" table="`simplelist_shor`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_shor_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_shor_idx`"/>
+			<element type="short"/>
+		</list>
+		<list name="enu" table="`simplelist_enu`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_enu_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_enu_idx`"/>
+			<element>
+				<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+					<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
+					<param name="eclassifier">SimpleEnum</param>
+					<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+				</type>
+			</element>
+		</list>
+		<list name="dat" table="`simplelist_dat`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_dat_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_dat_idx`"/>
+			<element type="timestamp"/>
+		</list>
+		<list name="limitedstring" table="`simplelist_limitedstring`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_limitedstring_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_limitedstring_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+		<list name="stri" table="`simplelist_stri`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_stri_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_stri_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+		<array name="intArray" table="`simplelist_intarray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_intarray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_intarray_idx`"/>
+			<element type="int"/>
+		</array>
+		<array name="doubleArray" table="`simplelist_doublearray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_doublearray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_doublearray_idx`"/>
+			<element type="double"/>
+		</array>
+		<property name="stringArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.StringArray">
+			<column not-null="true" unique="false" name="`stringarray`"/>
+		</property>
+		<array name="byteArray" table="`simplelist_bytearray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_bytearray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_bytearray_idx`"/>
+			<element type="byte"/>
+		</array>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeImpl" entity-name="SimpleType" abstract="false" lazy="false" table="`simpletype`">
+		<meta attribute="eclassName">SimpleType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</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="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`code`"/>
+		</property>
+		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`boo`"/>
+		</property>
+		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
+			<column not-null="false" unique="false" name="`byt`"/>
+		</property>
+		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
+			<column not-null="false" unique="false" name="`doubl`"/>
+		</property>
+		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
+			<column not-null="false" unique="false" name="`float`"/>
+		</property>
+		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`inte`"/>
+		</property>
+		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`lon`"/>
+		</property>
+		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="short">
+			<column not-null="false" unique="false" name="`shor`"/>
+		</property>
+		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`enu`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
+				<param name="eclassifier">SimpleEnum</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
+			</type>
+		</property>
+		<property name="dat" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`dat`"/>
+		</property>
+		<property name="limitedstring" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`limitedstring`" length="10"/>
+		</property>
+		<property name="limitedDecimal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+			<column not-null="false" unique="false" name="`limiteddecimal`" precision="4" scale="1"/>
+		</property>
+		<property name="extraLimitedString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`extralimitedstring`" length="5"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeObjectImpl" entity-name="SimpleTypeObject" abstract="false" lazy="false" table="`simpletypeobject`">
+		<meta attribute="eclassName">SimpleTypeObject</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</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="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`code`"/>
+		</property>
+		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
+			<column not-null="false" unique="false" name="`boo`"/>
+		</property>
+		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Byte">
+			<column not-null="false" unique="false" name="`byt`"/>
+		</property>
+		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Double">
+			<column not-null="false" unique="false" name="`doubl`"/>
+		</property>
+		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Float">
+			<column not-null="false" unique="false" name="`float`"/>
+		</property>
+		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Integer">
+			<column not-null="false" unique="false" name="`inte`"/>
+		</property>
+		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Long">
+			<column not-null="false" unique="false" name="`lon`"/>
+		</property>
+		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Short">
+			<column not-null="false" unique="false" name="`shor`"/>
+		</property>
+		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false" type="simpletypes.SimpleEnumObject">
+			<column not-null="false" unique="false" name="`enu`"/>
+		</property>
+		<property name="dat" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`dat`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..39dbe7b5e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,68 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" discriminator-value="PurchaseOrder" table="`purchaseorder`">
+		<meta attribute="eclassName">PurchaseOrder</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/simplefeaturemap</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 type="string">
+			<column name="dtype" index="purchaseorderdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.SupplierImpl" entity-name="Supplier" abstract="false" lazy="false" discriminator-value="Supplier" table="`supplier`">
+		<meta attribute="eclassName">Supplier</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/simplefeaturemap</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 type="string">
+			<column name="dtype" index="supplierdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="orders" table="`supplier_orders`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`supplier_orders_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`supplier_orders_idx`"/>
+			<one-to-many entity-name="Supplier_orders"/>
+		</list>
+	</class>
+	<class entity-name="Supplier_orders" lazy="false" table="`supplier_orders`">
+		<meta attribute="featureMap">Supplier</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="preferredOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="supplier_preferredorders" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`orders_purchaseorder_preferredorders_e_id`"/>
+		</many-to-one>
+		<many-to-one name="standardOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="supplier_standardorders" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`orders_purchaseorder_standardorders_e_id`"/>
+		</many-to-one>
+		<property name="hardCopyOrderReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`orders_hardcopyorderreference`"/>
+		</property>
+		<property name="hardCopyOrderNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`orders_hardcopyordernumber`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e855677d5
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,62 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`">
+		<meta attribute="eclassName">PurchaseOrder</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/simplefeaturemap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.SupplierImpl" entity-name="Supplier" abstract="false" lazy="false" table="`supplier`">
+		<meta attribute="eclassName">Supplier</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/simplefeaturemap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="orders" table="`supplier_orders`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`supplier_orders_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`supplier_orders_idx`"/>
+			<one-to-many entity-name="Supplier_orders"/>
+		</list>
+	</class>
+	<class entity-name="Supplier_orders" lazy="false" table="`supplier_orders`">
+		<meta attribute="featureMap">Supplier</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="preferredOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="supplier_preferredorders" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`orders_purchaseorder_preferredorders_e_id`"/>
+		</many-to-one>
+		<many-to-one name="standardOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="supplier_standardorders" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`orders_purchaseorder_standardorders_e_id`"/>
+		</many-to-one>
+		<property name="hardCopyOrderReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`orders_hardcopyorderreference`"/>
+		</property>
+		<property name="hardCopyOrderNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`orders_hardcopyordernumber`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e855677d5
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,62 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`">
+		<meta attribute="eclassName">PurchaseOrder</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/simplefeaturemap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.SupplierImpl" entity-name="Supplier" abstract="false" lazy="false" table="`supplier`">
+		<meta attribute="eclassName">Supplier</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/simplefeaturemap</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="orders" table="`supplier_orders`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`supplier_orders_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`supplier_orders_idx`"/>
+			<one-to-many entity-name="Supplier_orders"/>
+		</list>
+	</class>
+	<class entity-name="Supplier_orders" lazy="false" table="`supplier_orders`">
+		<meta attribute="featureMap">Supplier</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="preferredOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="supplier_preferredorders" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`orders_purchaseorder_preferredorders_e_id`"/>
+		</many-to-one>
+		<many-to-one name="standardOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="supplier_standardorders" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`orders_purchaseorder_standardorders_e_id`"/>
+		</many-to-one>
+		<property name="hardCopyOrderReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`orders_hardcopyorderreference`"/>
+		</property>
+		<property name="hardCopyOrderNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`orders_hardcopyordernumber`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9980b3a99
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,127 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.ComplexNumberImpl" entity-name="ComplexNumber" abstract="false" lazy="false" discriminator-value="ComplexNumber" table="`complexnumber`">
+		<meta attribute="eclassName">ComplexNumber</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</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 type="string">
+			<column name="dtype" index="complexnumberdtype" length="255" not-null="true"/>
+		</discriminator>
+		<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" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+		<property name="unit" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`unit`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.EvenComplexNumberTypeImpl" entity-name="EvenComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" discriminator-value="EvenComplexNumberType">
+		<meta attribute="eclassName">EvenComplexNumberType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.MultiNumberTypeImpl" entity-name="MultiNumberType" abstract="false" lazy="false" discriminator-value="MultiNumberType" table="`multinumbertype`">
+		<meta attribute="eclassName">MultiNumberType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</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 type="string">
+			<column name="dtype" index="multinumbertypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="myComplexAbstractGroup" table="`multinumbertype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`multinumbertype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`multinumbertype_mycomplexabstractgroup_idx`"/>
+			<one-to-many entity-name="MultiNumberType_myComplexAbstractGroup"/>
+		</list>
+	</class>
+	<class entity-name="MultiNumberType_myComplexAbstractGroup" lazy="false" table="`multinumbertype_mycomplexabstractgroup`">
+		<meta attribute="featureMap">MultiNumberType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="myComplexAbstract" entity-name="ComplexNumber" lazy="false" cascade="all" foreign-key="multinumbertype_mycomplexabstract" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexnumber_mycomplexabstract_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.NumberTypeImpl" entity-name="NumberType" abstract="false" lazy="false" discriminator-value="NumberType" table="`numbertype`">
+		<meta attribute="eclassName">NumberType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</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 type="string">
+			<column name="dtype" index="numbertypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="mySimpleAbstractGroup" table="`numbertype_mysimpleabstractgroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`numbertype_mysimpleabstractgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`numbertype_mysimpleabstractgroup_idx`"/>
+			<one-to-many entity-name="NumberType_mySimpleAbstractGroup"/>
+		</list>
+		<list name="myComplexAbstractGroup" table="`numbertype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`numbertype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`numbertype_mycomplexabstractgroup_idx`"/>
+			<one-to-many entity-name="NumberType_myComplexAbstractGroup"/>
+		</list>
+	</class>
+	<class entity-name="NumberType_mySimpleAbstractGroup" lazy="false" table="`numbertype_mysimpleabstractgroup`">
+		<meta attribute="featureMap">NumberType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="mySimpleAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`mysimpleabstractgroup_mysimpleabstract`"/>
+		</property>
+	</class>
+	<class entity-name="NumberType_myComplexAbstractGroup" lazy="false" table="`numbertype_mycomplexabstractgroup`">
+		<meta attribute="featureMap">NumberType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="myComplexAbstract" entity-name="ComplexNumber" lazy="false" cascade="all" foreign-key="numbertype_mycomplexabstract" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexnumber_mycomplexabstract_e_id`"/>
+		</many-to-one>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.OddComplexNumberTypeImpl" entity-name="OddComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" discriminator-value="OddComplexNumberType">
+		<meta attribute="eclassName">OddComplexNumberType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..748778b2f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,124 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.ComplexNumberImpl" entity-name="ComplexNumber" abstract="false" lazy="false" table="`complexnumber`">
+		<meta attribute="eclassName">ComplexNumber</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</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="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+		<property name="unit" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`unit`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.EvenComplexNumberTypeImpl" entity-name="EvenComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" table="`evencomplexnumbertype`">
+		<meta attribute="eclassName">EvenComplexNumberType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
+		<key>
+			<column name="`complexnumber_e_id`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.MultiNumberTypeImpl" entity-name="MultiNumberType" abstract="false" lazy="false" table="`multinumbertype`">
+		<meta attribute="eclassName">MultiNumberType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="myComplexAbstractGroup" table="`multinumbertype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`multinumbertype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`multinumbertype_mycomplexabstractgroup_idx`"/>
+			<one-to-many entity-name="MultiNumberType_myComplexAbstractGroup"/>
+		</list>
+	</class>
+	<class entity-name="MultiNumberType_myComplexAbstractGroup" lazy="false" table="`multinumbertype_mycomplexabstractgroup`">
+		<meta attribute="featureMap">MultiNumberType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="myComplexAbstract" entity-name="ComplexNumber" lazy="false" cascade="all" foreign-key="multinumbertype_mycomplexabstract" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexnumber_mycomplexabstract_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.NumberTypeImpl" entity-name="NumberType" abstract="false" lazy="false" table="`numbertype`">
+		<meta attribute="eclassName">NumberType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="mySimpleAbstractGroup" table="`numbertype_mysimpleabstractgroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`numbertype_mysimpleabstractgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`numbertype_mysimpleabstractgroup_idx`"/>
+			<one-to-many entity-name="NumberType_mySimpleAbstractGroup"/>
+		</list>
+		<list name="myComplexAbstractGroup" table="`numbertype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`numbertype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`numbertype_mycomplexabstractgroup_idx`"/>
+			<one-to-many entity-name="NumberType_myComplexAbstractGroup"/>
+		</list>
+	</class>
+	<class entity-name="NumberType_mySimpleAbstractGroup" lazy="false" table="`numbertype_mysimpleabstractgroup`">
+		<meta attribute="featureMap">NumberType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="mySimpleAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`mysimpleabstractgroup_mysimpleabstract`"/>
+		</property>
+	</class>
+	<class entity-name="NumberType_myComplexAbstractGroup" lazy="false" table="`numbertype_mycomplexabstractgroup`">
+		<meta attribute="featureMap">NumberType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="myComplexAbstract" entity-name="ComplexNumber" lazy="false" cascade="all" foreign-key="numbertype_mycomplexabstract" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexnumber_mycomplexabstract_e_id`"/>
+		</many-to-one>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.OddComplexNumberTypeImpl" entity-name="OddComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" table="`oddcomplexnumbertype`">
+		<meta attribute="eclassName">OddComplexNumberType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
+		<key>
+			<column name="`complexnumber_e_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..748778b2f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,124 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.ComplexNumberImpl" entity-name="ComplexNumber" abstract="false" lazy="false" table="`complexnumber`">
+		<meta attribute="eclassName">ComplexNumber</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</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="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+		<property name="unit" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`unit`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.EvenComplexNumberTypeImpl" entity-name="EvenComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" table="`evencomplexnumbertype`">
+		<meta attribute="eclassName">EvenComplexNumberType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
+		<key>
+			<column name="`complexnumber_e_id`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.MultiNumberTypeImpl" entity-name="MultiNumberType" abstract="false" lazy="false" table="`multinumbertype`">
+		<meta attribute="eclassName">MultiNumberType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="myComplexAbstractGroup" table="`multinumbertype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`multinumbertype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`multinumbertype_mycomplexabstractgroup_idx`"/>
+			<one-to-many entity-name="MultiNumberType_myComplexAbstractGroup"/>
+		</list>
+	</class>
+	<class entity-name="MultiNumberType_myComplexAbstractGroup" lazy="false" table="`multinumbertype_mycomplexabstractgroup`">
+		<meta attribute="featureMap">MultiNumberType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="myComplexAbstract" entity-name="ComplexNumber" lazy="false" cascade="all" foreign-key="multinumbertype_mycomplexabstract" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexnumber_mycomplexabstract_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.NumberTypeImpl" entity-name="NumberType" abstract="false" lazy="false" table="`numbertype`">
+		<meta attribute="eclassName">NumberType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="mySimpleAbstractGroup" table="`numbertype_mysimpleabstractgroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`numbertype_mysimpleabstractgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`numbertype_mysimpleabstractgroup_idx`"/>
+			<one-to-many entity-name="NumberType_mySimpleAbstractGroup"/>
+		</list>
+		<list name="myComplexAbstractGroup" table="`numbertype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`numbertype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`numbertype_mycomplexabstractgroup_idx`"/>
+			<one-to-many entity-name="NumberType_myComplexAbstractGroup"/>
+		</list>
+	</class>
+	<class entity-name="NumberType_mySimpleAbstractGroup" lazy="false" table="`numbertype_mysimpleabstractgroup`">
+		<meta attribute="featureMap">NumberType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="mySimpleAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`mysimpleabstractgroup_mysimpleabstract`"/>
+		</property>
+	</class>
+	<class entity-name="NumberType_myComplexAbstractGroup" lazy="false" table="`numbertype_mycomplexabstractgroup`">
+		<meta attribute="featureMap">NumberType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="myComplexAbstract" entity-name="ComplexNumber" lazy="false" cascade="all" foreign-key="numbertype_mycomplexabstract" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexnumber_mycomplexabstract_e_id`"/>
+		</many-to-one>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.OddComplexNumberTypeImpl" entity-name="OddComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" table="`oddcomplexnumbertype`">
+		<meta attribute="eclassName">OddComplexNumberType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
+		<key>
+			<column name="`complexnumber_e_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..17e2497e7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,84 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexAAAImpl" entity-name="ComplexAAA" abstract="false" lazy="false" discriminator-value="ComplexAAA" table="`complexaaa`">
+		<meta attribute="eclassName">ComplexAAA</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</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 type="string">
+			<column name="dtype" index="complexaaadtype" length="255" not-null="true"/>
+		</discriminator>
+		<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" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexEvenTypeImpl" entity-name="ComplexEvenType" abstract="false" lazy="false" extends="ComplexAAA" discriminator-value="ComplexEvenType">
+		<meta attribute="eclassName">ComplexEvenType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexOddTypeImpl" entity-name="ComplexOddType" abstract="false" lazy="false" extends="ComplexAAA" discriminator-value="ComplexOddType">
+		<meta attribute="eclassName">ComplexOddType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.RootTypeImpl" entity-name="RootType" abstract="false" lazy="false" discriminator-value="RootType" table="`roottype`">
+		<meta attribute="eclassName">RootType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</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 type="string">
+			<column name="dtype" index="roottypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="myAbstractGroup" table="`roottype_myabstractgroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`roottype_myabstractgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`roottype_myabstractgroup_idx`"/>
+			<one-to-many entity-name="RootType_myAbstractGroup"/>
+		</list>
+		<list name="myComplexAbstractGroup" table="`roottype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`roottype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`roottype_mycomplexabstractgroup_idx`"/>
+			<one-to-many entity-name="RootType_myComplexAbstractGroup"/>
+		</list>
+	</class>
+	<class entity-name="RootType_myAbstractGroup" lazy="false" table="`roottype_myabstractgroup`">
+		<meta attribute="featureMap">RootType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="myAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`myabstractgroup_myabstract`"/>
+		</property>
+	</class>
+	<class entity-name="RootType_myComplexAbstractGroup" lazy="false" table="`roottype_mycomplexabstractgroup`">
+		<meta attribute="featureMap">RootType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="myComplexAbstract" entity-name="ComplexAAA" lazy="false" cascade="all" foreign-key="roottype_mycomplexabstract" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexaaa_mycomplexabstract_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c43878c5d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,84 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexAAAImpl" entity-name="ComplexAAA" abstract="false" lazy="false" table="`complexaaa`">
+		<meta attribute="eclassName">ComplexAAA</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</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="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexEvenTypeImpl" entity-name="ComplexEvenType" abstract="false" lazy="false" extends="ComplexAAA" table="`complexeventype`">
+		<meta attribute="eclassName">ComplexEvenType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
+		<key>
+			<column name="`complexaaa_e_id`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexOddTypeImpl" entity-name="ComplexOddType" abstract="false" lazy="false" extends="ComplexAAA" table="`complexoddtype`">
+		<meta attribute="eclassName">ComplexOddType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
+		<key>
+			<column name="`complexaaa_e_id`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.RootTypeImpl" entity-name="RootType" abstract="false" lazy="false" table="`roottype`">
+		<meta attribute="eclassName">RootType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</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="myAbstractGroup" table="`roottype_myabstractgroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`roottype_myabstractgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`roottype_myabstractgroup_idx`"/>
+			<one-to-many entity-name="RootType_myAbstractGroup"/>
+		</list>
+		<list name="myComplexAbstractGroup" table="`roottype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`roottype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`roottype_mycomplexabstractgroup_idx`"/>
+			<one-to-many entity-name="RootType_myComplexAbstractGroup"/>
+		</list>
+	</class>
+	<class entity-name="RootType_myAbstractGroup" lazy="false" table="`roottype_myabstractgroup`">
+		<meta attribute="featureMap">RootType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="myAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`myabstractgroup_myabstract`"/>
+		</property>
+	</class>
+	<class entity-name="RootType_myComplexAbstractGroup" lazy="false" table="`roottype_mycomplexabstractgroup`">
+		<meta attribute="featureMap">RootType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="myComplexAbstract" entity-name="ComplexAAA" lazy="false" cascade="all" foreign-key="roottype_mycomplexabstract" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexaaa_mycomplexabstract_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..c43878c5d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,84 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexAAAImpl" entity-name="ComplexAAA" abstract="false" lazy="false" table="`complexaaa`">
+		<meta attribute="eclassName">ComplexAAA</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</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="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexEvenTypeImpl" entity-name="ComplexEvenType" abstract="false" lazy="false" extends="ComplexAAA" table="`complexeventype`">
+		<meta attribute="eclassName">ComplexEvenType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
+		<key>
+			<column name="`complexaaa_e_id`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexOddTypeImpl" entity-name="ComplexOddType" abstract="false" lazy="false" extends="ComplexAAA" table="`complexoddtype`">
+		<meta attribute="eclassName">ComplexOddType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
+		<key>
+			<column name="`complexaaa_e_id`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.RootTypeImpl" entity-name="RootType" abstract="false" lazy="false" table="`roottype`">
+		<meta attribute="eclassName">RootType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</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="myAbstractGroup" table="`roottype_myabstractgroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`roottype_myabstractgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`roottype_myabstractgroup_idx`"/>
+			<one-to-many entity-name="RootType_myAbstractGroup"/>
+		</list>
+		<list name="myComplexAbstractGroup" table="`roottype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`roottype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`roottype_mycomplexabstractgroup_idx`"/>
+			<one-to-many entity-name="RootType_myComplexAbstractGroup"/>
+		</list>
+	</class>
+	<class entity-name="RootType_myAbstractGroup" lazy="false" table="`roottype_myabstractgroup`">
+		<meta attribute="featureMap">RootType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<property name="myAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`myabstractgroup_myabstract`"/>
+		</property>
+	</class>
+	<class entity-name="RootType_myComplexAbstractGroup" lazy="false" table="`roottype_mycomplexabstractgroup`">
+		<meta attribute="featureMap">RootType</meta>
+		<id type="long">
+			<generator class="native"/>
+		</id>
+		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="fme_feature" type="java.lang.String"/>
+		<many-to-one name="myComplexAbstract" entity-name="ComplexAAA" lazy="false" cascade="all" foreign-key="roottype_mycomplexabstract" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexaaa_mycomplexabstract_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractReferenceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractReferenceAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0ba596884
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractReferenceAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,98 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</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 type="string">
+			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="country" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="address_country">
+				<column name="`address_country_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`address_country_idx`"/>
+			<one-to-many entity-name="City"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.CityImpl" entity-name="City" abstract="true" lazy="false" discriminator-value="City" table="`city`">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</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 type="string">
+			<column name="dtype" index="citydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="city_address">
+				<column name="`city_address_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`city_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</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 type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="person_address">
+				<column name="`person_address_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`state`"/>
+		</property>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.USCityImpl" entity-name="USCity" abstract="false" lazy="false" extends="City" discriminator-value="USCity">
+		<meta attribute="eclassName">USCity</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`state`"/>
+		</property>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.USOfficeAddressImpl" entity-name="USOfficeAddress" abstract="false" lazy="false" extends="USAddress" discriminator-value="USOfficeAddress">
+		<meta attribute="eclassName">USOfficeAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
+		<property name="location" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`location`"/>
+		</property>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractReferenceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractReferenceAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..be8757cb8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractReferenceAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,98 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName" inherit="false">Address</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="country" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="address_country">
+				<column name="`address_country_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`address_country_idx`"/>
+			<one-to-many entity-name="City"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.CityImpl" entity-name="City" abstract="true" lazy="false" table="`city`">
+		<meta attribute="eclassName" inherit="false">City</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="city_address">
+				<column name="`city_address_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`city_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="person_address">
+				<column name="`person_address_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`">
+		<meta attribute="eclassName" inherit="false">USAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="state" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`state`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.USCityImpl" entity-name="USCity" abstract="false" lazy="false" extends="City" table="`uscity`">
+		<meta attribute="eclassName" inherit="false">USCity</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
+		<key>
+			<column name="`city_e_id`"/>
+		</key>
+		<property name="state" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`state`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.USOfficeAddressImpl" entity-name="USOfficeAddress" abstract="false" lazy="false" extends="USAddress" table="`usofficeaddress`">
+		<meta attribute="eclassName" inherit="false">USOfficeAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
+		<key>
+			<column name="`usaddress_e_id`"/>
+		</key>
+		<property name="location" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`location`"/>
+		</property>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractReferenceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractReferenceAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..be8757cb8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractReferenceAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,98 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName" inherit="false">Address</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="country" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="address_country">
+				<column name="`address_country_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`address_country_idx`"/>
+			<one-to-many entity-name="City"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.CityImpl" entity-name="City" abstract="true" lazy="false" table="`city`">
+		<meta attribute="eclassName" inherit="false">City</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="city_address">
+				<column name="`city_address_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`city_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="person_address">
+				<column name="`person_address_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`">
+		<meta attribute="eclassName" inherit="false">USAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="state" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`state`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.USCityImpl" entity-name="USCity" abstract="false" lazy="false" extends="City" table="`uscity`">
+		<meta attribute="eclassName" inherit="false">USCity</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
+		<key>
+			<column name="`city_e_id`"/>
+		</key>
+		<property name="state" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`state`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractreference.impl.USOfficeAddressImpl" entity-name="USOfficeAddress" abstract="false" lazy="false" extends="USAddress" table="`usofficeaddress`">
+		<meta attribute="eclassName" inherit="false">USOfficeAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta>
+		<key>
+			<column name="`usaddress_e_id`"/>
+		</key>
+		<property name="location" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`location`"/>
+		</property>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractTopClassAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractTopClassAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9ac279678
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractTopClassAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,157 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="abstractsuper.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</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="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" discriminator-value="ContentList" table="`contentlist`">
+		<meta attribute="eclassName">ContentList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="contentlistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_address">
+				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_price">
+				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_price_idx`"/>
+			<one-to-many entity-name="Price"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName">UKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName">DistrictUKAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<key>
+			<column name="`ukaddress_name`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
+		<meta attribute="eclassName">Price</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</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 type="string">
+			<column name="DISCRIMINATOR" index="mypriceDISCRIMINATOR" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
+		<meta attribute="eclassName">InternationalPrice</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.abstractsuper.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" discriminator-value="Customer" table="`customer`">
+		<meta attribute="eclassName">Customer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="customerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" discriminator-value="SpecificCustomer">
+		<meta attribute="eclassName">SpecificCustomer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`specificname`"/>
+		</property>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" discriminator-value="UKAddressList" table="`ukaddresslist`">
+		<meta attribute="eclassName">UKAddressList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ukaddresslistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="ukaddresslist_address">
+				<column name="`ukaddresslist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ukaddresslist_address_idx`"/>
+			<one-to-many entity-name="UKAddress"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractTopClassAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractTopClassAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e42a79368
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractTopClassAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,151 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="abstractsuper.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName" inherit="false">Address</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" table="`contentlist`">
+		<meta attribute="eclassName" inherit="false">ContentList</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_address">
+				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_price">
+				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_price_idx`"/>
+			<one-to-many entity-name="Price"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName" inherit="false">UKAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName" inherit="false">DistrictUKAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<key>
+			<column name="`ukaddress_name`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
+		<meta attribute="eclassName" inherit="false">Price</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="DISCRIMINATOR" index="mypriceDISCRIMINATOR" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
+		<meta attribute="eclassName" inherit="false">InternationalPrice</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
+		<meta attribute="eclassName" inherit="false">USAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.abstractsuper.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
+		<meta attribute="eclassName" inherit="false">Customer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
+		<meta attribute="eclassName" inherit="false">SpecificCustomer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<key>
+			<column name="`customer_name`"/>
+		</key>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`specificname`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" table="`ukaddresslist`">
+		<meta attribute="eclassName" inherit="false">UKAddressList</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="ukaddresslist_address">
+				<column name="`ukaddresslist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ukaddresslist_address_idx`"/>
+			<one-to-many entity-name="UKAddress"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractTopClassAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractTopClassAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e42a79368
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AbstractTopClassAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,151 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="abstractsuper.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</param>
+		<param name="edatatype">USStateObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName" inherit="false">Address</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`street`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`city`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" table="`contentlist`">
+		<meta attribute="eclassName" inherit="false">ContentList</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_address">
+				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_address_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="contentlist_price">
+				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`contentlist_price_idx`"/>
+			<one-to-many entity-name="Price"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
+		<meta attribute="eclassName" inherit="false">UKAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`postcode`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
+		<meta attribute="eclassName" inherit="false">DistrictUKAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<key>
+			<column name="`ukaddress_name`"/>
+		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`district`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
+		<meta attribute="eclassName" inherit="false">Price</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="DISCRIMINATOR" index="mypriceDISCRIMINATOR" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
+			<column not-null="true" unique="false" name="`value`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
+		<meta attribute="eclassName" inherit="false">InternationalPrice</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`currency`"/>
+		</property>
+	</subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
+		<meta attribute="eclassName" inherit="false">USAddress</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<key>
+			<column name="`address_name`"/>
+		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`state`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.abstractsuper.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/issues/abstractsuper</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`zip`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
+		<meta attribute="eclassName" inherit="false">Customer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
+		<meta attribute="eclassName" inherit="false">SpecificCustomer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<key>
+			<column name="`customer_name`"/>
+		</key>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`specificname`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.issues.abstractsuper.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" table="`ukaddresslist`">
+		<meta attribute="eclassName" inherit="false">UKAddressList</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/issues/abstractsuper</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="address" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="ukaddresslist_address">
+				<column name="`ukaddresslist_address_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`ukaddresslist_address_idx`"/>
+			<one-to-many entity-name="UKAddress"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AgilAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AgilAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d01f9623e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AgilAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,1313 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<!--	Generated by Teneo on Wed Mar 28 18:05:07 CEST 2007 -->
+<hibernate-mapping>
+	<class entity-name="LearningObject" abstract="true" lazy="false" discriminator-value="LearningObject" table="`learningobject`">
+		<meta attribute="eclassName">LearningObject</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="timestamp" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`timestamp`"/>
+		</property>
+		<property name="synchronized" lazy="false" insert="true" update="true" not-null="true" unique="false" type="boolean">
+			<column not-null="true" unique="false" name="`synchronized`"/>
+		</property>
+	</class>
+	<subclass entity-name="Block" abstract="true" lazy="false" extends="LearningObject" discriminator-value="Block">
+		<meta attribute="eclassName">Block</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<many-to-one name="blockMeta" class="BlockMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`blockmeta_blockmeta_id`"/>
+		</many-to-one>
+		<bag name="externalMetadata" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`block_externalmetadata_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many class="ExternalMetadata"/>
+		</bag>
+		<many-to-one name="accessControl" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass entity-name="HypertextBlock" abstract="false" lazy="false" extends="Block" discriminator-value="HypertextBlock">
+		<meta attribute="eclassName">HypertextBlock</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<list name="hypertextContent" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`hypertextblock_hypertextcontent_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`hypertextblock_hypertextcontent_idx`"/>
+			<one-to-many class="HypertextContent"/>
+		</list>
+	</subclass>
+	<subclass entity-name="AbstractContent" abstract="true" lazy="false" extends="LearningObject" discriminator-value="AbstractContent">
+		<meta attribute="eclassName">AbstractContent</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<property name="heading" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`heading`"/>
+		</property>
+		<many-to-one name="language" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_language_e_id`"/>
+		</many-to-one>
+		<many-to-one name="source" class="Source" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`source_source_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass entity-name="HypertextContent" abstract="false" lazy="false" extends="AbstractContent" discriminator-value="HypertextContent">
+		<meta attribute="eclassName">HypertextContent</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<property name="content" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`content`"/>
+		</property>
+		<many-to-one name="blockAudiofile" class="BlockAudiofile" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`blockaudiofile_blockaudiofile_id`"/>
+		</many-to-one>
+		<bag name="resrcFile" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`resrcfile_hypertextcontent`">
+			<key update="true">
+				<column name="`hypertextcontent_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="ResrcFile" unique="false">
+				<column name="`resrcfile_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</subclass>
+	<subclass entity-name="BlockFolder" abstract="false" lazy="false" extends="LearningObject" discriminator-value="BlockFolder">
+		<meta attribute="eclassName">BlockFolder</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<many-to-one name="folderMeta" class="FolderMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`foldermeta_foldermeta_id`"/>
+		</many-to-one>
+		<list name="blockFolder" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`blockfolder_blockfolder_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`blockfolder_blockfolder_idx`"/>
+			<one-to-many class="BlockFolder"/>
+		</list>
+		<list name="block" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`blockfolder_block_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`blockfolder_block_idx`"/>
+			<one-to-many class="Block"/>
+		</list>
+		<many-to-one name="accessControl" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass entity-name="Category" abstract="false" lazy="false" extends="LearningObject" discriminator-value="Category">
+		<meta attribute="eclassName">Category</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<list name="titleMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`category_titlemeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`category_titlemeta_idx`"/>
+			<one-to-many class="TitleMeta"/>
+		</list>
+		<list name="course" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`category_course_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`category_course_idx`"/>
+			<one-to-many class="Course"/>
+		</list>
+	</subclass>
+	<class entity-name="CorrBlock" abstract="false" lazy="false" discriminator-value="CorrBlock" table="`corrblock`">
+		<meta attribute="eclassName">CorrBlock</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="presentationBlock" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`corrblock_presentationblock_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`corrblock_presentationblock_idx`"/>
+			<one-to-many class="PresentationBlock"/>
+		</list>
+		<list name="titleMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`corrblock_titlemeta_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`corrblock_titlemeta_idx`"/>
+			<one-to-many class="TitleMeta"/>
+		</list>
+	</class>
+	<subclass entity-name="Course" abstract="false" lazy="false" extends="LearningObject" discriminator-value="Course">
+		<meta attribute="eclassName">Course</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<many-to-one name="courseMeta" class="CourseMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`coursemeta_coursemeta_id`"/>
+		</many-to-one>
+		<bag name="externalMetadata" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`course_externalmetadata_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many class="ExternalMetadata"/>
+		</bag>
+		<many-to-one name="coursetype" class="Coursetype" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`coursetype_coursetype_e_id`"/>
+		</many-to-one>
+		<property name="outlineAsXml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`outlineasxml`"/>
+		</property>
+		<list name="module" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`course_module_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`course_module_idx`"/>
+			<one-to-many class="Module"/>
+		</list>
+	</subclass>
+	<class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="corrBlock" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`item_corrblock_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`item_corrblock_idx`"/>
+			<one-to-many class="CorrBlock"/>
+		</list>
+		<list name="childitems" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`item_childitems_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`item_childitems_idx`"/>
+			<one-to-many class="Item"/>
+		</list>
+		<property name="luRef" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`luref`"/>
+		</property>
+	</class>
+	<subclass entity-name="LearningUnit" abstract="false" lazy="false" extends="LearningObject" discriminator-value="LearningUnit">
+		<meta attribute="eclassName">LearningUnit</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<many-to-one name="luMeta" class="LuMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`lumeta_lumeta_id`"/>
+		</many-to-one>
+		<bag name="externalMetadata" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`learningunit_externalmetadata_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many class="ExternalMetadata"/>
+		</bag>
+		<property name="treeAsXml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`treeasxml`"/>
+		</property>
+		<property name="luFile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lufile`"/>
+		</property>
+		<many-to-one name="accessControl" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+		<list name="item" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`learningunit_item_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`learningunit_item_idx`"/>
+			<one-to-many class="Item"/>
+		</list>
+	</subclass>
+	<subclass entity-name="LuFolder" abstract="false" lazy="false" extends="LearningObject" discriminator-value="LuFolder">
+		<meta attribute="eclassName">LuFolder</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<many-to-one name="folderMeta" class="FolderMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`foldermeta_foldermeta_id`"/>
+		</many-to-one>
+		<list name="luFolder" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`lufolder_lufolder_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`lufolder_lufolder_idx`"/>
+			<one-to-many class="LuFolder"/>
+		</list>
+		<list name="learningUnit" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`lufolder_learningunit_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`lufolder_learningunit_idx`"/>
+			<one-to-many class="LearningUnit"/>
+		</list>
+		<many-to-one name="accessControl" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass entity-name="Module" abstract="false" lazy="false" extends="LearningObject" discriminator-value="Module">
+		<meta attribute="eclassName">Module</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<many-to-one name="moduleMeta" class="ModuleMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`modulemeta_modulemeta_id`"/>
+		</many-to-one>
+		<bag name="externalMetadata" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`module_externalmetadata_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many class="ExternalMetadata"/>
+		</bag>
+		<many-to-one name="rootNode" class="Node" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`node_rootnode_e_id`"/>
+		</many-to-one>
+		<property name="moduleFile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`modulefile`"/>
+		</property>
+		<property name="treeAsXml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`treeasxml`"/>
+		</property>
+		<many-to-one name="accessControl" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass entity-name="ModuleFolder" abstract="false" lazy="false" extends="LearningObject" discriminator-value="ModuleFolder">
+		<meta attribute="eclassName">ModuleFolder</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<many-to-one name="folderMeta" class="FolderMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`foldermeta_foldermeta_id`"/>
+		</many-to-one>
+		<list name="moduleFolder" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`modulefolder_modulefolder_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`modulefolder_modulefolder_idx`"/>
+			<one-to-many class="ModuleFolder"/>
+		</list>
+		<list name="module" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`modulefolder_module_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`modulefolder_module_idx`"/>
+			<one-to-many class="Module"/>
+		</list>
+		<many-to-one name="accessControl" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass entity-name="ResrcFolder" abstract="false" lazy="false" extends="LearningObject" discriminator-value="ResrcFolder">
+		<meta attribute="eclassName">ResrcFolder</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<many-to-one name="folderMeta" class="FolderMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`foldermeta_foldermeta_id`"/>
+		</many-to-one>
+		<list name="resrcFolder" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`resrcfolder_resrcfolder_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`resrcfolder_resrcfolder_idx`"/>
+			<one-to-many class="ResrcFolder"/>
+		</list>
+		<many-to-one name="accessControl" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+		<property name="deleteScheduled" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`deletescheduled`"/>
+		</property>
+		<list name="resrcFile" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`resrcfolder_resrcfile_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`resrcfolder_resrcfile_idx`"/>
+			<one-to-many class="ResrcFile"/>
+		</list>
+	</subclass>
+	<subclass entity-name="Theme" abstract="false" lazy="false" extends="LearningObject" discriminator-value="Theme">
+		<meta attribute="eclassName">Theme</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<list name="simpleDidacMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`theme_simpledidacmeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`theme_simpledidacmeta_idx`"/>
+			<one-to-many class="SimpleDidacMeta"/>
+		</list>
+	</subclass>
+	<class entity-name="PresentationBlock" abstract="false" lazy="false" discriminator-value="PresentationBlock" table="`presentationblock`">
+		<meta attribute="eclassName">PresentationBlock</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="lod" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`lod`"/>
+		</property>
+		<property name="rendering" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`rendering`"/>
+		</property>
+		<many-to-one name="block" class="Block" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`block_block_id`"/>
+		</many-to-one>
+	</class>
+	<class name="lobj.Node" entity-name="Node" proxy="lobj.Node" abstract="true" lazy="true" discriminator-value="Node" table="`node`">
+		<meta attribute="eclassName">Node</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="visible" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`visible`"/>
+		</property>
+	</class>
+	<subclass entity-name="ThemeNode" abstract="false" lazy="false" extends="Node" discriminator-value="ThemeNode">
+		<meta attribute="eclassName">ThemeNode</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<many-to-one name="theme" class="Theme" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`theme_theme_id`"/>
+		</many-to-one>
+		<list name="childnodes" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`themenode_childnodes_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`themenode_childnodes_idx`"/>
+			<one-to-many class="Node"/>
+		</list>
+	</subclass>
+	<subclass entity-name="LuNode" abstract="false" lazy="false" extends="Node" discriminator-value="LuNode">
+		<meta attribute="eclassName">LuNode</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<many-to-one name="learningUnit" class="LearningUnit" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`learningunit_learningunit_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass entity-name="ResrcFile" abstract="false" lazy="false" extends="LearningObject" discriminator-value="ResrcFile">
+		<meta attribute="eclassName">ResrcFile</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<array name="file" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`resrcfile_file_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`resrcfile_file_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="file_tn" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`resrcfile_file_tn_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`resrcfile_file_tn_idx`"/>
+			<element type="byte"/>
+		</array>
+		<property name="originalextension" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`originalextension`"/>
+		</property>
+		<property name="filesize" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`filesize`"/>
+		</property>
+		<property name="resrcHref" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`resrchref`"/>
+		</property>
+		<many-to-one name="accesscontrol" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+		<many-to-one name="resrcFiletype" class="ResrcFiletype" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`resrcfiletype_resrcfiletype_e_id`"/>
+		</many-to-one>
+		<many-to-one name="source" class="Source" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`source_source_e_id`"/>
+		</many-to-one>
+		<bag name="hypertextContent" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`resrcfile_hypertextcontent`">
+			<key update="true">
+				<column name="`resrcfile_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="HypertextContent" unique="false">
+				<column name="`hypertextcontent_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<many-to-one name="resrcMeta" class="ResrcMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`resrcmeta_resrcmeta_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass entity-name="BlockAudiofile" abstract="false" lazy="false" extends="LearningObject" discriminator-value="BlockAudiofile">
+		<meta attribute="eclassName">BlockAudiofile</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<array name="file" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`blockaudiofile_file_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`blockaudiofile_file_idx`"/>
+			<element type="byte"/>
+		</array>
+		<property name="originalextension" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`originalextension`"/>
+		</property>
+		<property name="filesize" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`filesize`"/>
+		</property>
+		<property name="resrcHref" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`resrchref`"/>
+		</property>
+		<many-to-one name="resrcFiletype" class="ResrcFiletype" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`resrcfiletype_resrcfiletype_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<class entity-name="ResrcFiletype" abstract="false" lazy="false" discriminator-value="ResrcFiletype" table="`resrcfiletype`">
+		<meta attribute="eclassName">ResrcFiletype</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="filetypeExtension" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`filetypeextension`"/>
+		</property>
+		<property name="filetypeDesc" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`filetypedesc`"/>
+		</property>
+		<property name="image" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`image`"/>
+		</property>
+		<property name="applet" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`applet`"/>
+		</property>
+		<property name="filetypeImageSmall" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`filetypeimagesmall`"/>
+		</property>
+		<property name="filetypeImageBif" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`filetypeimagebif`"/>
+		</property>
+	</class>
+	<class entity-name="AccessControl" abstract="false" lazy="false" discriminator-value="AccessControl" table="`accesscontrol`">
+		<meta attribute="eclassName">AccessControl</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="owner" class="User" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`user_owner_e_id`"/>
+		</many-to-one>
+		<property name="lastModified" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`lastmodified`"/>
+		</property>
+		<many-to-one name="lastModifiedBy" class="User" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`user_lastmodifiedby_e_id`"/>
+		</many-to-one>
+		<property name="status" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`status`"/>
+		</property>
+		<property name="lastStatusChange" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`laststatuschange`"/>
+		</property>
+		<many-to-one name="lastStatusChangeBy" class="User" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`user_laststatuschangeby_e_id`"/>
+		</many-to-one>
+		<many-to-one name="sharednotes" class="Sharednotes" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`sharednotes_sharednotes_e_id`"/>
+		</many-to-one>
+		<list name="authorizes" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`accesscontrol_authorizes_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accesscontrol_authorizes_idx`"/>
+			<one-to-many class="Userauthorization"/>
+		</list>
+		<list name="editionHistory" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`accesscontrol_editionhistory_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accesscontrol_editionhistory_idx`"/>
+			<one-to-many class="Edition"/>
+		</list>
+		<property name="globalAccess" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`globalaccess`"/>
+		</property>
+	</class>
+	<class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`street`"/>
+		</property>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`postcode`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`city`"/>
+		</property>
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`state`"/>
+		</property>
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`country`"/>
+		</property>
+		<property name="phone" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`phone`"/>
+		</property>
+		<property name="fax" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`fax`"/>
+		</property>
+		<property name="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="otheraddr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`otheraddr`"/>
+		</property>
+	</class>
+	<class entity-name="Affiliation" abstract="false" lazy="false" discriminator-value="Affiliation" table="`affiliation`">
+		<meta attribute="eclassName">Affiliation</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="shortaffil" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`shortaffil`"/>
+		</property>
+		<property name="jobtitle" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`jobtitle`"/>
+		</property>
+		<property name="orgname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`orgname`"/>
+		</property>
+		<property name="orgdiv" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`orgdiv`"/>
+		</property>
+		<many-to-one name="address" class="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="Author" abstract="false" lazy="false" discriminator-value="Author" table="`author`">
+		<meta attribute="eclassName">Author</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="credittype" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`credittype`"/>
+		</property>
+		<many-to-one name="person" class="Person" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`person_person_e_id`"/>
+		</many-to-one>
+		<many-to-one name="address" class="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_id`"/>
+		</many-to-one>
+		<property name="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>
+	</class>
+	<subclass entity-name="BlockMeta" abstract="false" lazy="false" extends="LearningObject" discriminator-value="BlockMeta">
+		<meta attribute="eclassName">BlockMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<property name="lod" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`lod`"/>
+		</property>
+		<property name="rendering" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`rendering`"/>
+		</property>
+		<many-to-one name="blocktype" class="Blocktype" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`blocktype_blocktype_e_id`"/>
+		</many-to-one>
+		<property name="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<property name="lastModified" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`lastmodified`"/>
+		</property>
+		<list name="simpleDidacMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`blockmeta_simpledidacmeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`blockmeta_simpledidacmeta_idx`"/>
+			<one-to-many class="SimpleDidacMeta"/>
+		</list>
+		<many-to-one name="defLang" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_deflang_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<class entity-name="Blocktype" abstract="false" lazy="false" discriminator-value="Blocktype" table="`blocktype`">
+		<meta attribute="eclassName">Blocktype</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<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="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<property name="styleRef" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`styleref`"/>
+		</property>
+		<bag name="domains" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`domain_blocktype`">
+			<key update="true">
+				<column name="`blocktype_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Domain" unique="false">
+				<column name="`domain_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class entity-name="TitleMeta" abstract="false" lazy="false" discriminator-value="TitleMeta" table="`titlemeta`">
+		<meta attribute="eclassName">TitleMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="language" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_language_e_id`"/>
+		</many-to-one>
+		<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>
+	<subclass entity-name="CourseMeta" abstract="false" lazy="false" extends="LearningObject" discriminator-value="CourseMeta">
+		<meta attribute="eclassName">CourseMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<list name="didacMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`coursemeta_didacmeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`coursemeta_didacmeta_idx`"/>
+			<one-to-many class="DidacMeta"/>
+		</list>
+		<property name="hours" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`hours`"/>
+		</property>
+		<property name="lvanr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lvanr`"/>
+		</property>
+		<property name="columnfilterasxml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`columnfilterasxml`"/>
+		</property>
+		<property name="fromext" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`fromext`"/>
+		</property>
+		<property name="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<many-to-one name="lecturer" class="User" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`user_lecturer_e_id`"/>
+		</many-to-one>
+		<many-to-one name="defLang" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_deflang_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<class entity-name="SimpleDidacMeta" abstract="false" lazy="false" discriminator-value="SimpleDidacMeta" table="`simpledidacmeta`">
+		<meta attribute="eclassName">SimpleDidacMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="language" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_language_e_id`"/>
+		</many-to-one>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="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="keywords" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`keywords`"/>
+		</property>
+	</class>
+	<subclass entity-name="DidacMeta" abstract="false" lazy="false" extends="SimpleDidacMeta" discriminator-value="DidacMeta">
+		<meta attribute="eclassName">DidacMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<property name="goal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`goal`"/>
+		</property>
+		<many-to-one name="precognition" class="Precognition" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`precognition_precognition_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<class entity-name="Domain" abstract="false" lazy="false" discriminator-value="Domain" table="`domain`">
+		<meta attribute="eclassName">Domain</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<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>
+		<bag name="blocktypes" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`domain_blocktype`">
+			<key update="true">
+				<column name="`domain_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Blocktype" unique="false">
+				<column name="`blocktype_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<property name="serverURL" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`serverurl`"/>
+		</property>
+	</class>
+	<class entity-name="Edition" abstract="false" lazy="false" discriminator-value="Edition" table="`edition`">
+		<meta attribute="eclassName">Edition</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="editionNr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`editionnr`"/>
+		</property>
+		<property name="editedBy" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`editedby`"/>
+		</property>
+		<property name="version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`version`"/>
+		</property>
+		<property name="lastVersionNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lastversionnumber`"/>
+		</property>
+		<property name="status" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`status`"/>
+		</property>
+		<property name="editionCreationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`editioncreationdate`"/>
+		</property>
+	</class>
+	<subclass entity-name="FolderMeta" abstract="false" lazy="false" extends="LearningObject" discriminator-value="FolderMeta">
+		<meta attribute="eclassName">FolderMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="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="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+	</subclass>
+	<subclass entity-name="LuMeta" abstract="false" lazy="false" extends="LearningObject" discriminator-value="LuMeta">
+		<meta attribute="eclassName">LuMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<list name="didacMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`lumeta_didacmeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`lumeta_didacmeta_idx`"/>
+			<one-to-many class="DidacMeta"/>
+		</list>
+		<property name="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<many-to-one name="domain" class="Domain" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`domain_domain_id`"/>
+		</many-to-one>
+		<list name="authors" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`lumeta_authors_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`lumeta_authors_idx`"/>
+			<one-to-many class="Author"/>
+		</list>
+		<many-to-one name="publishInfo" class="PublishInfo" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`publishinfo_publishinfo_e_id`"/>
+		</many-to-one>
+		<many-to-one name="defLang" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_deflang_e_id`"/>
+		</many-to-one>
+	</subclass>
+	<class entity-name="Userauthorization" abstract="false" lazy="false" discriminator-value="Userauthorization" table="`userauthorization`">
+		<meta attribute="eclassName">Userauthorization</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="user" class="User" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`user_user_e_id`"/>
+		</many-to-one>
+		<many-to-one name="authType" class="AuthorizationTypes" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`authorizationtypes_authtype_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="Note" abstract="false" lazy="false" discriminator-value="Note" table="`note`">
+		<meta attribute="eclassName">Note</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`date`"/>
+		</property>
+		<property name="noteAuthor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`noteauthor`"/>
+		</property>
+		<property name="content" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`content`"/>
+		</property>
+	</class>
+	<class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="honorific" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`honorific`"/>
+		</property>
+		<property name="firstname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`firstname`"/>
+		</property>
+		<property name="surname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`surname`"/>
+		</property>
+		<property name="contrib" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`contrib`"/>
+		</property>
+		<list name="affiliations" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`person_affiliations_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_affiliations_idx`"/>
+			<one-to-many class="Affiliation"/>
+		</list>
+		<property name="personblurb" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`personblurb`"/>
+		</property>
+	</class>
+	<class entity-name="Publisher" abstract="false" lazy="false" discriminator-value="Publisher" table="`publisher`">
+		<meta attribute="eclassName">Publisher</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="publishername" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`publishername`"/>
+		</property>
+		<many-to-one name="address" class="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="PublishInfo" abstract="false" lazy="false" discriminator-value="PublishInfo" table="`publishinfo`">
+		<meta attribute="eclassName">PublishInfo</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="edition" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`edition`"/>
+		</property>
+		<property name="pubdate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`pubdate`"/>
+		</property>
+		<many-to-one name="publisher" class="Publisher" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`publisher_publisher_id`"/>
+		</many-to-one>
+		<property name="pubsnumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`pubsnumber`"/>
+		</property>
+		<property name="releaseinfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`releaseinfo`"/>
+		</property>
+	</class>
+	<subclass entity-name="ResrcMeta" abstract="false" lazy="false" extends="LearningObject" discriminator-value="ResrcMeta">
+		<meta attribute="eclassName">ResrcMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<property name="filename" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`filename`"/>
+		</property>
+		<property name="parameters" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`parameters`"/>
+		</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>
+		<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="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<property name="lastModified" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`lastmodified`"/>
+		</property>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="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="keywords" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`keywords`"/>
+		</property>
+	</subclass>
+	<class entity-name="Sharednotes" abstract="false" lazy="false" discriminator-value="Sharednotes" table="`sharednotes`">
+		<meta attribute="eclassName">Sharednotes</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="notes" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`sharednotes_notes_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`sharednotes_notes_idx`"/>
+			<one-to-many class="Note"/>
+		</list>
+	</class>
+	<class entity-name="Coursetype" abstract="false" lazy="false" discriminator-value="Coursetype" table="`coursetype`">
+		<meta attribute="eclassName">Coursetype</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="language" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_language_e_id`"/>
+		</many-to-one>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="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>
+	</class>
+	<class entity-name="ExternalMetadata" abstract="false" lazy="false" discriminator-value="ExternalMetadata" table="`externalmetadata`">
+		<meta attribute="eclassName">ExternalMetadata</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="ref" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ref`"/>
+		</property>
+		<property name="file" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`file`"/>
+		</property>
+	</class>
+	<class entity-name="Language" abstract="false" lazy="false" discriminator-value="Language" table="`language`">
+		<meta attribute="eclassName">Language</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="code" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</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="language" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`language`"/>
+		</property>
+	</class>
+	<class entity-name="Precognition" abstract="false" lazy="false" discriminator-value="Precognition" table="`precognition`">
+		<meta attribute="eclassName">Precognition</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="precog" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`precog`"/>
+		</property>
+		<list name="internalRefs" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`precognition_internalrefs_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`precognition_internalrefs_idx`"/>
+			<one-to-many class="InternalRef"/>
+		</list>
+	</class>
+	<class entity-name="InternalRef" abstract="false" lazy="false" discriminator-value="InternalRef" table="`internalref`">
+		<meta attribute="eclassName">InternalRef</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="language" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_language_code`"/>
+		</many-to-one>
+		<property name="ref" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ref`"/>
+		</property>
+		<property name="file" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`file`"/>
+		</property>
+		<property name="reftype" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`reftype`"/>
+		</property>
+	</class>
+	<subclass entity-name="ModuleMeta" abstract="false" lazy="false" extends="LearningObject" discriminator-value="ModuleMeta">
+		<meta attribute="eclassName">ModuleMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<list name="didacMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`modulemeta_didacmeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`modulemeta_didacmeta_idx`"/>
+			<one-to-many class="DidacMeta"/>
+		</list>
+		<property name="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<list name="authors" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`modulemeta_authors_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`modulemeta_authors_idx`"/>
+			<one-to-many class="Author"/>
+		</list>
+		<many-to-one name="publishInfo" class="PublishInfo" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`publishinfo_publishinfo_id`"/>
+		</many-to-one>
+		<many-to-one name="defLang" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_deflang_code`"/>
+		</many-to-one>
+	</subclass>
+	<class entity-name="Source" abstract="false" lazy="false" discriminator-value="Source" table="`source`">
+		<meta attribute="eclassName">Source</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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" class="Author" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`author_author_id`"/>
+		</many-to-one>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="subtitle" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`subtitle`"/>
+		</property>
+		<property name="publishedIn" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`publishedin`"/>
+		</property>
+		<property name="publishedBy" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`publishedby`"/>
+		</property>
+		<property name="publishDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`publishdate`"/>
+		</property>
+		<property name="pp" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`pp`"/>
+		</property>
+	</class>
+	<class entity-name="AuthorizationTypes" abstract="false" lazy="false" discriminator-value="AuthorizationTypes" table="`authorizationtypes`">
+		<meta attribute="eclassName">AuthorizationTypes</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="authType" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`authtype`"/>
+		</property>
+		<property name="authTypeDesc" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`authtypedesc`"/>
+		</property>
+		<property name="readOnly" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`readonly`"/>
+		</property>
+	</class>
+	<class entity-name="User" abstract="false" lazy="false" discriminator-value="User" table="`user`">
+		<meta attribute="eclassName">User</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="loginname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`loginname`"/>
+		</property>
+		<property name="password" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`password`"/>
+		</property>
+		<property name="firstname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`firstname`"/>
+		</property>
+		<property name="lastname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lastname`"/>
+		</property>
+		<property name="matriculationnr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`matriculationnr`"/>
+		</property>
+		<property name="scn" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`scn`"/>
+		</property>
+		<property name="icqnumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`icqnumber`"/>
+		</property>
+		<property name="icqpassword" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`icqpassword`"/>
+		</property>
+		<property name="entryasxml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`entryasxml`"/>
+		</property>
+		<property name="languagenr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`languagenr`"/>
+		</property>
+		<property name="notificationprofileasxml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`notificationprofileasxml`"/>
+		</property>
+		<property name="dossierasxml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`dossierasxml`"/>
+		</property>
+		<array name="photo" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`user_photo_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`user_photo_idx`"/>
+			<element type="byte"/>
+		</array>
+		<property name="onlinestatus" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`onlinestatus`"/>
+		</property>
+		<property name="onlinedate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`onlinedate`"/>
+		</property>
+		<property name="datafilter" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`datafilter`"/>
+		</property>
+		<property name="inchatsince" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`inchatsince`"/>
+		</property>
+		<property name="contchatdate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`contchatdate`"/>
+		</property>
+		<property name="chatroomnr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`chatroomnr`"/>
+		</property>
+		<property name="fromext" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`fromext`"/>
+		</property>
+		<property name="lastlogindate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`lastlogindate`"/>
+		</property>
+		<property name="currlogindate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`currlogindate`"/>
+		</property>
+		<property name="lastcoursematerialnr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`lastcoursematerialnr`"/>
+		</property>
+		<property name="lastcoursematerialviewnr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`lastcoursematerialviewnr`"/>
+		</property>
+		<property name="authenticateldap" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`authenticateldap`"/>
+		</property>
+		<property name="photochanged" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`photochanged`"/>
+		</property>
+		<list name="authorizations" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`user_authorizations_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`user_authorizations_idx`"/>
+			<one-to-many class="AuthorizationTypes"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AgilAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AgilAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..85786a337
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AgilAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,1356 @@
+<?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 Mar 27 09:40:39 CEST 2007 -->
+<hibernate-mapping>
+	<class entity-name="LearningObject" abstract="true" lazy="false" table="`learningobject`">
+		<meta attribute="eclassName">LearningObject</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="timestamp" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`timestamp`"/>
+		</property>
+		<property name="synchronized" lazy="false" insert="true" update="true" not-null="true" unique="false" type="boolean">
+			<column not-null="true" unique="false" name="`synchronized`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="Block" abstract="true" lazy="false" extends="LearningObject" table="`block`">
+		<meta attribute="eclassName">Block</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="blockMeta" entity-name="BlockMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`blockmeta_blockmeta_id`"/>
+		</many-to-one>
+		<bag name="externalMetadata" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`block_externalmetadata_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="ExternalMetadata"/>
+		</bag>
+		<many-to-one name="accessControl" entity-name="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="HypertextBlock" abstract="false" lazy="false" extends="Block" table="`hypertextblock`">
+		<meta attribute="eclassName">HypertextBlock</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`block_id`"/>
+		</key>
+		<list name="hypertextContent" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`hypertextblock_hypertextcontent_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`hypertextblock_hypertextcontent_idx`"/>
+			<one-to-many entity-name="HypertextContent"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass entity-name="AbstractContent" abstract="true" lazy="false" extends="LearningObject" table="`abstractcontent`">
+		<meta attribute="eclassName">AbstractContent</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<property name="heading" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`heading`"/>
+		</property>
+		<many-to-one name="language" entity-name="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_language_e_id`"/>
+		</many-to-one>
+		<many-to-one name="source" entity-name="Source" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`source_source_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="HypertextContent" abstract="false" lazy="false" extends="AbstractContent" table="`hypertextcontent`">
+		<meta attribute="eclassName">HypertextContent</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`abstractcontent_id`"/>
+		</key>
+		<property name="content" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`content`"/>
+		</property>
+		<many-to-one name="blockAudiofile" entity-name="BlockAudiofile" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`blockaudiofile_blockaudiofile_id`"/>
+		</many-to-one>
+		<bag name="resrcFile" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`resrcfile_hypertextcontent`">
+			<key update="true">
+				<column name="`hypertextcontent_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="ResrcFile" unique="false">
+				<column name="`resrcfile_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</joined-subclass>
+	<joined-subclass entity-name="BlockFolder" abstract="false" lazy="false" extends="LearningObject" table="`blockfolder`">
+		<meta attribute="eclassName">BlockFolder</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="folderMeta" entity-name="FolderMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`foldermeta_foldermeta_id`"/>
+		</many-to-one>
+		<list name="blockFolder" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`blockfolder_blockfolder_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`blockfolder_blockfolder_idx`"/>
+			<one-to-many entity-name="BlockFolder"/>
+		</list>
+		<list name="block" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`blockfolder_block_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`blockfolder_block_idx`"/>
+			<one-to-many entity-name="Block"/>
+		</list>
+		<many-to-one name="accessControl" entity-name="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="Category" abstract="false" lazy="false" extends="LearningObject" table="`category`">
+		<meta attribute="eclassName">Category</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<list name="titleMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`category_titlemeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`category_titlemeta_idx`"/>
+			<one-to-many entity-name="TitleMeta"/>
+		</list>
+		<list name="course" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`category_course_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`category_course_idx`"/>
+			<one-to-many entity-name="Course"/>
+		</list>
+	</joined-subclass>
+	<class entity-name="CorrBlock" abstract="false" lazy="false" table="`corrblock`">
+		<meta attribute="eclassName">CorrBlock</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="presentationBlock" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`corrblock_presentationblock_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`corrblock_presentationblock_idx`"/>
+			<one-to-many entity-name="PresentationBlock"/>
+		</list>
+		<list name="titleMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`corrblock_titlemeta_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`corrblock_titlemeta_idx`"/>
+			<one-to-many entity-name="TitleMeta"/>
+		</list>
+	</class>
+	<joined-subclass entity-name="Course" abstract="false" lazy="false" extends="LearningObject" table="`course`">
+		<meta attribute="eclassName">Course</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="courseMeta" entity-name="CourseMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`coursemeta_coursemeta_id`"/>
+		</many-to-one>
+		<bag name="externalMetadata" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`course_externalmetadata_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="ExternalMetadata"/>
+		</bag>
+		<many-to-one name="coursetype" entity-name="Coursetype" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`coursetype_coursetype_e_id`"/>
+		</many-to-one>
+		<property name="outlineAsXml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`outlineasxml`"/>
+		</property>
+		<list name="module" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`course_module_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`course_module_idx`"/>
+			<one-to-many entity-name="Module"/>
+		</list>
+	</joined-subclass>
+	<class entity-name="Item" abstract="false" lazy="false" table="`item`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="corrBlock" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`item_corrblock_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`item_corrblock_idx`"/>
+			<one-to-many entity-name="CorrBlock"/>
+		</list>
+		<list name="childitems" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`item_childitems_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`item_childitems_idx`"/>
+			<one-to-many entity-name="Item"/>
+		</list>
+		<property name="luRef" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`luref`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="LearningUnit" abstract="false" lazy="false" extends="LearningObject" table="`learningunit`">
+		<meta attribute="eclassName">LearningUnit</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="luMeta" entity-name="LuMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`lumeta_lumeta_id`"/>
+		</many-to-one>
+		<bag name="externalMetadata" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`learningunit_externalmetadata_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="ExternalMetadata"/>
+		</bag>
+		<property name="treeAsXml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`treeasxml`"/>
+		</property>
+		<property name="luFile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lufile`"/>
+		</property>
+		<many-to-one name="accessControl" entity-name="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+		<list name="item" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`learningunit_item_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`learningunit_item_idx`"/>
+			<one-to-many entity-name="Item"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass entity-name="LuFolder" abstract="false" lazy="false" extends="LearningObject" table="`lufolder`">
+		<meta attribute="eclassName">LuFolder</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="folderMeta" entity-name="FolderMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`foldermeta_foldermeta_id`"/>
+		</many-to-one>
+		<list name="luFolder" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`lufolder_lufolder_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`lufolder_lufolder_idx`"/>
+			<one-to-many entity-name="LuFolder"/>
+		</list>
+		<list name="learningUnit" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`lufolder_learningunit_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`lufolder_learningunit_idx`"/>
+			<one-to-many entity-name="LearningUnit"/>
+		</list>
+		<many-to-one name="accessControl" entity-name="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="Module" abstract="false" lazy="false" extends="LearningObject" table="`module`">
+		<meta attribute="eclassName">Module</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="moduleMeta" entity-name="ModuleMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`modulemeta_modulemeta_id`"/>
+		</many-to-one>
+		<bag name="externalMetadata" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`module_externalmetadata_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="ExternalMetadata"/>
+		</bag>
+		<many-to-one name="rootNode" entity-name="Node" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`node_rootnode_e_id`"/>
+		</many-to-one>
+		<property name="moduleFile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`modulefile`"/>
+		</property>
+		<property name="treeAsXml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`treeasxml`"/>
+		</property>
+		<many-to-one name="accessControl" entity-name="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="ModuleFolder" abstract="false" lazy="false" extends="LearningObject" table="`modulefolder`">
+		<meta attribute="eclassName">ModuleFolder</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="folderMeta" entity-name="FolderMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`foldermeta_foldermeta_id`"/>
+		</many-to-one>
+		<list name="moduleFolder" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`modulefolder_modulefolder_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`modulefolder_modulefolder_idx`"/>
+			<one-to-many entity-name="ModuleFolder"/>
+		</list>
+		<list name="module" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`modulefolder_module_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`modulefolder_module_idx`"/>
+			<one-to-many entity-name="Module"/>
+		</list>
+		<many-to-one name="accessControl" entity-name="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="ResrcFolder" abstract="false" lazy="false" extends="LearningObject" table="`resrcfolder`">
+		<meta attribute="eclassName">ResrcFolder</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="folderMeta" entity-name="FolderMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`foldermeta_foldermeta_id`"/>
+		</many-to-one>
+		<list name="resrcFolder" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`resrcfolder_resrcfolder_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`resrcfolder_resrcfolder_idx`"/>
+			<one-to-many entity-name="ResrcFolder"/>
+		</list>
+		<many-to-one name="accessControl" entity-name="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+		<property name="deleteScheduled" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`deletescheduled`"/>
+		</property>
+		<list name="resrcFile" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`resrcfolder_resrcfile_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`resrcfolder_resrcfile_idx`"/>
+			<one-to-many entity-name="ResrcFile"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass entity-name="Theme" abstract="false" lazy="false" extends="LearningObject" table="`theme`">
+		<meta attribute="eclassName">Theme</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<list name="simpleDidacMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`theme_simpledidacmeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`theme_simpledidacmeta_idx`"/>
+			<one-to-many entity-name="SimpleDidacMeta"/>
+		</list>
+	</joined-subclass>
+	<class entity-name="PresentationBlock" abstract="false" lazy="false" table="`presentationblock`">
+		<meta attribute="eclassName">PresentationBlock</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="lod" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`lod`"/>
+		</property>
+		<property name="rendering" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`rendering`"/>
+		</property>
+		<many-to-one name="block" entity-name="Block" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`block_block_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="Node" abstract="true" lazy="false" table="`node`">
+		<meta attribute="eclassName">Node</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="visible" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`visible`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="ThemeNode" abstract="false" lazy="false" extends="Node" table="`themenode`">
+		<meta attribute="eclassName">ThemeNode</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`node_id`"/>
+		</key>
+		<many-to-one name="theme" entity-name="Theme" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`theme_theme_id`"/>
+		</many-to-one>
+		<list name="childnodes" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`themenode_childnodes_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`themenode_childnodes_idx`"/>
+			<one-to-many entity-name="Node"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass entity-name="LuNode" abstract="false" lazy="false" extends="Node" table="`lunode`">
+		<meta attribute="eclassName">LuNode</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`node_id`"/>
+		</key>
+		<many-to-one name="learningUnit" entity-name="LearningUnit" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`learningunit_learningunit_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="ResrcFile" abstract="false" lazy="false" extends="LearningObject" table="`resrcfile`">
+		<meta attribute="eclassName">ResrcFile</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<array name="file" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`resrcfile_file_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`resrcfile_file_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="file_tn" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`resrcfile_file_tn_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`resrcfile_file_tn_idx`"/>
+			<element type="byte"/>
+		</array>
+		<property name="originalextension" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`originalextension`"/>
+		</property>
+		<property name="filesize" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`filesize`"/>
+		</property>
+		<property name="resrcHref" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`resrchref`"/>
+		</property>
+		<many-to-one name="accesscontrol" entity-name="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+		<many-to-one name="resrcFiletype" entity-name="ResrcFiletype" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`resrcfiletype_resrcfiletype_e_id`"/>
+		</many-to-one>
+		<many-to-one name="source" entity-name="Source" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`source_source_e_id`"/>
+		</many-to-one>
+		<bag name="hypertextContent" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`resrcfile_hypertextcontent`">
+			<key update="true">
+				<column name="`resrcfile_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="HypertextContent" unique="false">
+				<column name="`hypertextcontent_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<many-to-one name="resrcMeta" entity-name="ResrcMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`resrcmeta_resrcmeta_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="BlockAudiofile" abstract="false" lazy="false" extends="LearningObject" table="`blockaudiofile`">
+		<meta attribute="eclassName">BlockAudiofile</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<array name="file" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`blockaudiofile_file_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`blockaudiofile_file_idx`"/>
+			<element type="byte"/>
+		</array>
+		<property name="originalextension" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`originalextension`"/>
+		</property>
+		<property name="filesize" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`filesize`"/>
+		</property>
+		<property name="resrcHref" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`resrchref`"/>
+		</property>
+		<many-to-one name="resrcFiletype" entity-name="ResrcFiletype" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`resrcfiletype_resrcfiletype_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class entity-name="ResrcFiletype" abstract="false" lazy="false" table="`resrcfiletype`">
+		<meta attribute="eclassName">ResrcFiletype</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="filetypeExtension" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`filetypeextension`"/>
+		</property>
+		<property name="filetypeDesc" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`filetypedesc`"/>
+		</property>
+		<property name="image" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`image`"/>
+		</property>
+		<property name="applet" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`applet`"/>
+		</property>
+		<property name="filetypeImageSmall" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`filetypeimagesmall`"/>
+		</property>
+		<property name="filetypeImageBif" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`filetypeimagebif`"/>
+		</property>
+	</class>
+	<class entity-name="AccessControl" abstract="false" lazy="false" table="`accesscontrol`">
+		<meta attribute="eclassName">AccessControl</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="owner" entity-name="User" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`user_owner_e_id`"/>
+		</many-to-one>
+		<property name="lastModified" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`lastmodified`"/>
+		</property>
+		<many-to-one name="lastModifiedBy" entity-name="User" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`user_lastmodifiedby_e_id`"/>
+		</many-to-one>
+		<property name="status" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`status`"/>
+		</property>
+		<property name="lastStatusChange" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`laststatuschange`"/>
+		</property>
+		<many-to-one name="lastStatusChangeBy" entity-name="User" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`user_laststatuschangeby_e_id`"/>
+		</many-to-one>
+		<many-to-one name="sharednotes" entity-name="Sharednotes" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`sharednotes_sharednotes_e_id`"/>
+		</many-to-one>
+		<list name="authorizes" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`accesscontrol_authorizes_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accesscontrol_authorizes_idx`"/>
+			<one-to-many entity-name="Userauthorization"/>
+		</list>
+		<list name="editionHistory" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`accesscontrol_editionhistory_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accesscontrol_editionhistory_idx`"/>
+			<one-to-many entity-name="Edition"/>
+		</list>
+		<property name="globalAccess" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`globalaccess`"/>
+		</property>
+	</class>
+	<class entity-name="Address" abstract="false" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`street`"/>
+		</property>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`postcode`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`city`"/>
+		</property>
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`state`"/>
+		</property>
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`country`"/>
+		</property>
+		<property name="phone" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`phone`"/>
+		</property>
+		<property name="fax" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`fax`"/>
+		</property>
+		<property name="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="otheraddr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`otheraddr`"/>
+		</property>
+	</class>
+	<class entity-name="Affiliation" abstract="false" lazy="false" table="`affiliation`">
+		<meta attribute="eclassName">Affiliation</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="shortaffil" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`shortaffil`"/>
+		</property>
+		<property name="jobtitle" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`jobtitle`"/>
+		</property>
+		<property name="orgname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`orgname`"/>
+		</property>
+		<property name="orgdiv" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`orgdiv`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="Author" abstract="false" lazy="false" table="`author`">
+		<meta attribute="eclassName">Author</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="credittype" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`credittype`"/>
+		</property>
+		<many-to-one name="person" entity-name="Person" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`person_person_e_id`"/>
+		</many-to-one>
+		<many-to-one name="address" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_id`"/>
+		</many-to-one>
+		<property name="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>
+	</class>
+	<joined-subclass entity-name="BlockMeta" abstract="false" lazy="false" extends="LearningObject" table="`blockmeta`">
+		<meta attribute="eclassName">BlockMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<property name="lod" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`lod`"/>
+		</property>
+		<property name="rendering" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`rendering`"/>
+		</property>
+		<many-to-one name="blocktype" entity-name="Blocktype" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`blocktype_blocktype_e_id`"/>
+		</many-to-one>
+		<property name="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<property name="lastModified" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`lastmodified`"/>
+		</property>
+		<list name="simpleDidacMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`blockmeta_simpledidacmeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`blockmeta_simpledidacmeta_idx`"/>
+			<one-to-many entity-name="SimpleDidacMeta"/>
+		</list>
+		<many-to-one name="defLang" entity-name="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_deflang_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class entity-name="Blocktype" abstract="false" lazy="false" table="`blocktype`">
+		<meta attribute="eclassName">Blocktype</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<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="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<property name="styleRef" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`styleref`"/>
+		</property>
+		<bag name="domains" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`domain_blocktype`">
+			<key update="true">
+				<column name="`blocktype_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Domain" unique="false">
+				<column name="`domain_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class entity-name="TitleMeta" abstract="false" lazy="false" table="`titlemeta`">
+		<meta attribute="eclassName">TitleMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="language" entity-name="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_language_e_id`"/>
+		</many-to-one>
+		<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>
+	<joined-subclass entity-name="CourseMeta" abstract="false" lazy="false" extends="LearningObject" table="`coursemeta`">
+		<meta attribute="eclassName">CourseMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<list name="didacMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`coursemeta_didacmeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`coursemeta_didacmeta_idx`"/>
+			<one-to-many entity-name="DidacMeta"/>
+		</list>
+		<property name="hours" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`hours`"/>
+		</property>
+		<property name="lvanr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lvanr`"/>
+		</property>
+		<property name="columnfilterasxml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`columnfilterasxml`"/>
+		</property>
+		<property name="fromext" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`fromext`"/>
+		</property>
+		<property name="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<many-to-one name="lecturer" entity-name="User" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`user_lecturer_e_id`"/>
+		</many-to-one>
+		<many-to-one name="defLang" entity-name="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_deflang_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class entity-name="SimpleDidacMeta" abstract="false" lazy="false" table="`simpledidacmeta`">
+		<meta attribute="eclassName">SimpleDidacMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="language" entity-name="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_language_e_id`"/>
+		</many-to-one>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="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="keywords" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`keywords`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="DidacMeta" abstract="false" lazy="false" extends="SimpleDidacMeta" table="`didacmeta`">
+		<meta attribute="eclassName">DidacMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`simpledidacmeta_id`"/>
+		</key>
+		<property name="goal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`goal`"/>
+		</property>
+		<many-to-one name="precognition" entity-name="Precognition" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`precognition_precognition_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class entity-name="Domain" abstract="false" lazy="false" table="`domain`">
+		<meta attribute="eclassName">Domain</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<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>
+		<bag name="blocktypes" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`domain_blocktype`">
+			<key update="true">
+				<column name="`domain_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Blocktype" unique="false">
+				<column name="`blocktype_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<property name="serverURL" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`serverurl`"/>
+		</property>
+	</class>
+	<class entity-name="Edition" abstract="false" lazy="false" table="`edition`">
+		<meta attribute="eclassName">Edition</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="editionNr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`editionnr`"/>
+		</property>
+		<property name="editedBy" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`editedby`"/>
+		</property>
+		<property name="version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`version`"/>
+		</property>
+		<property name="lastVersionNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lastversionnumber`"/>
+		</property>
+		<property name="status" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`status`"/>
+		</property>
+		<property name="editionCreationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`editioncreationdate`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="FolderMeta" abstract="false" lazy="false" extends="LearningObject" table="`foldermeta`">
+		<meta attribute="eclassName">FolderMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="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="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass entity-name="LuMeta" abstract="false" lazy="false" extends="LearningObject" table="`lumeta`">
+		<meta attribute="eclassName">LuMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<list name="didacMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`lumeta_didacmeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`lumeta_didacmeta_idx`"/>
+			<one-to-many entity-name="DidacMeta"/>
+		</list>
+		<property name="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<many-to-one name="domain" entity-name="Domain" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`domain_domain_id`"/>
+		</many-to-one>
+		<list name="authors" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`lumeta_authors_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`lumeta_authors_idx`"/>
+			<one-to-many entity-name="Author"/>
+		</list>
+		<many-to-one name="publishInfo" entity-name="PublishInfo" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`publishinfo_publishinfo_e_id`"/>
+		</many-to-one>
+		<many-to-one name="defLang" entity-name="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_deflang_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class entity-name="Userauthorization" abstract="false" lazy="false" table="`userauthorization`">
+		<meta attribute="eclassName">Userauthorization</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="user" entity-name="User" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`user_user_e_id`"/>
+		</many-to-one>
+		<many-to-one name="authType" entity-name="AuthorizationTypes" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`authorizationtypes_authtype_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="Note" abstract="false" lazy="false" table="`note`">
+		<meta attribute="eclassName">Note</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`date`"/>
+		</property>
+		<property name="noteAuthor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`noteauthor`"/>
+		</property>
+		<property name="content" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`content`"/>
+		</property>
+	</class>
+	<class entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="honorific" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`honorific`"/>
+		</property>
+		<property name="firstname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`firstname`"/>
+		</property>
+		<property name="surname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`surname`"/>
+		</property>
+		<property name="contrib" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`contrib`"/>
+		</property>
+		<list name="affiliations" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`person_affiliations_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_affiliations_idx`"/>
+			<one-to-many entity-name="Affiliation"/>
+		</list>
+		<property name="personblurb" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`personblurb`"/>
+		</property>
+	</class>
+	<class entity-name="Publisher" abstract="false" lazy="false" table="`publisher`">
+		<meta attribute="eclassName">Publisher</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="publishername" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`publishername`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="PublishInfo" abstract="false" lazy="false" table="`publishinfo`">
+		<meta attribute="eclassName">PublishInfo</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="edition" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`edition`"/>
+		</property>
+		<property name="pubdate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`pubdate`"/>
+		</property>
+		<many-to-one name="publisher" entity-name="Publisher" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`publisher_publisher_id`"/>
+		</many-to-one>
+		<property name="pubsnumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`pubsnumber`"/>
+		</property>
+		<property name="releaseinfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`releaseinfo`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="ResrcMeta" abstract="false" lazy="false" extends="LearningObject" table="`resrcmeta`">
+		<meta attribute="eclassName">ResrcMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<property name="filename" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`filename`"/>
+		</property>
+		<property name="parameters" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`parameters`"/>
+		</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>
+		<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="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<property name="lastModified" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`lastmodified`"/>
+		</property>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="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="keywords" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`keywords`"/>
+		</property>
+	</joined-subclass>
+	<class entity-name="Sharednotes" abstract="false" lazy="false" table="`sharednotes`">
+		<meta attribute="eclassName">Sharednotes</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="notes" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`sharednotes_notes_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`sharednotes_notes_idx`"/>
+			<one-to-many entity-name="Note"/>
+		</list>
+	</class>
+	<class entity-name="Coursetype" abstract="false" lazy="false" table="`coursetype`">
+		<meta attribute="eclassName">Coursetype</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="language" entity-name="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_language_e_id`"/>
+		</many-to-one>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="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>
+	</class>
+	<class entity-name="ExternalMetadata" abstract="false" lazy="false" table="`externalmetadata`">
+		<meta attribute="eclassName">ExternalMetadata</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="ref" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ref`"/>
+		</property>
+		<property name="file" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`file`"/>
+		</property>
+	</class>
+	<class entity-name="Language" abstract="false" lazy="false" table="`language`">
+		<meta attribute="eclassName">Language</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="code" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</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="language" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`language`"/>
+		</property>
+	</class>
+	<class entity-name="Precognition" abstract="false" lazy="false" table="`precognition`">
+		<meta attribute="eclassName">Precognition</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="precog" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`precog`"/>
+		</property>
+		<list name="internalRefs" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`precognition_internalrefs_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`precognition_internalrefs_idx`"/>
+			<one-to-many entity-name="InternalRef"/>
+		</list>
+	</class>
+	<class entity-name="InternalRef" abstract="false" lazy="false" table="`internalref`">
+		<meta attribute="eclassName">InternalRef</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="language" entity-name="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_language_code`"/>
+		</many-to-one>
+		<property name="ref" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ref`"/>
+		</property>
+		<property name="file" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`file`"/>
+		</property>
+		<property name="reftype" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`reftype`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="ModuleMeta" abstract="false" lazy="false" extends="LearningObject" table="`modulemeta`">
+		<meta attribute="eclassName">ModuleMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<list name="didacMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`modulemeta_didacmeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`modulemeta_didacmeta_idx`"/>
+			<one-to-many entity-name="DidacMeta"/>
+		</list>
+		<property name="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<list name="authors" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`modulemeta_authors_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`modulemeta_authors_idx`"/>
+			<one-to-many entity-name="Author"/>
+		</list>
+		<many-to-one name="publishInfo" entity-name="PublishInfo" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`publishinfo_publishinfo_id`"/>
+		</many-to-one>
+		<many-to-one name="defLang" entity-name="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_deflang_code`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class entity-name="Source" abstract="false" lazy="false" table="`source`">
+		<meta attribute="eclassName">Source</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="Author" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`author_author_id`"/>
+		</many-to-one>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="subtitle" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`subtitle`"/>
+		</property>
+		<property name="publishedIn" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`publishedin`"/>
+		</property>
+		<property name="publishedBy" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`publishedby`"/>
+		</property>
+		<property name="publishDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`publishdate`"/>
+		</property>
+		<property name="pp" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`pp`"/>
+		</property>
+	</class>
+	<class entity-name="AuthorizationTypes" abstract="false" lazy="false" table="`authorizationtypes`">
+		<meta attribute="eclassName">AuthorizationTypes</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="authType" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`authtype`"/>
+		</property>
+		<property name="authTypeDesc" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`authtypedesc`"/>
+		</property>
+		<property name="readOnly" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`readonly`"/>
+		</property>
+	</class>
+	<class entity-name="User" abstract="false" lazy="false" table="`user`">
+		<meta attribute="eclassName">User</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="loginname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`loginname`"/>
+		</property>
+		<property name="password" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`password`"/>
+		</property>
+		<property name="firstname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`firstname`"/>
+		</property>
+		<property name="lastname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lastname`"/>
+		</property>
+		<property name="matriculationnr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`matriculationnr`"/>
+		</property>
+		<property name="scn" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`scn`"/>
+		</property>
+		<property name="icqnumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`icqnumber`"/>
+		</property>
+		<property name="icqpassword" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`icqpassword`"/>
+		</property>
+		<property name="entryasxml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`entryasxml`"/>
+		</property>
+		<property name="languagenr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`languagenr`"/>
+		</property>
+		<property name="notificationprofileasxml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`notificationprofileasxml`"/>
+		</property>
+		<property name="dossierasxml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`dossierasxml`"/>
+		</property>
+		<array name="photo" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`user_photo_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`user_photo_idx`"/>
+			<element type="byte"/>
+		</array>
+		<property name="onlinestatus" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`onlinestatus`"/>
+		</property>
+		<property name="onlinedate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`onlinedate`"/>
+		</property>
+		<property name="datafilter" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`datafilter`"/>
+		</property>
+		<property name="inchatsince" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`inchatsince`"/>
+		</property>
+		<property name="contchatdate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`contchatdate`"/>
+		</property>
+		<property name="chatroomnr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`chatroomnr`"/>
+		</property>
+		<property name="fromext" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`fromext`"/>
+		</property>
+		<property name="lastlogindate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`lastlogindate`"/>
+		</property>
+		<property name="currlogindate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`currlogindate`"/>
+		</property>
+		<property name="lastcoursematerialnr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`lastcoursematerialnr`"/>
+		</property>
+		<property name="lastcoursematerialviewnr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`lastcoursematerialviewnr`"/>
+		</property>
+		<property name="authenticateldap" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`authenticateldap`"/>
+		</property>
+		<property name="photochanged" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`photochanged`"/>
+		</property>
+		<list name="authorizations" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`user_authorizations_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`user_authorizations_idx`"/>
+			<one-to-many entity-name="AuthorizationTypes"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AgilAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AgilAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..27c57b83d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/AgilAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,1356 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<!--	Generated by Teneo on Wed Mar 28 18:04:40 CEST 2007 -->
+<hibernate-mapping>
+	<class entity-name="LearningObject" abstract="true" lazy="false" table="`learningobject`">
+		<meta attribute="eclassName">LearningObject</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="timestamp" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
+			<column not-null="true" unique="false" name="`timestamp`"/>
+		</property>
+		<property name="synchronized" lazy="false" insert="true" update="true" not-null="true" unique="false" type="boolean">
+			<column not-null="true" unique="false" name="`synchronized`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="Block" abstract="true" lazy="false" extends="LearningObject" table="`block`">
+		<meta attribute="eclassName">Block</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="blockMeta" class="BlockMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`blockmeta_blockmeta_id`"/>
+		</many-to-one>
+		<bag name="externalMetadata" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`block_externalmetadata_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many class="ExternalMetadata"/>
+		</bag>
+		<many-to-one name="accessControl" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="HypertextBlock" abstract="false" lazy="false" extends="Block" table="`hypertextblock`">
+		<meta attribute="eclassName">HypertextBlock</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`block_id`"/>
+		</key>
+		<list name="hypertextContent" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`hypertextblock_hypertextcontent_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`hypertextblock_hypertextcontent_idx`"/>
+			<one-to-many class="HypertextContent"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass entity-name="AbstractContent" abstract="true" lazy="false" extends="LearningObject" table="`abstractcontent`">
+		<meta attribute="eclassName">AbstractContent</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<property name="heading" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`heading`"/>
+		</property>
+		<many-to-one name="language" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_language_e_id`"/>
+		</many-to-one>
+		<many-to-one name="source" class="Source" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`source_source_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="HypertextContent" abstract="false" lazy="false" extends="AbstractContent" table="`hypertextcontent`">
+		<meta attribute="eclassName">HypertextContent</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`abstractcontent_id`"/>
+		</key>
+		<property name="content" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`content`"/>
+		</property>
+		<many-to-one name="blockAudiofile" class="BlockAudiofile" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`blockaudiofile_blockaudiofile_id`"/>
+		</many-to-one>
+		<bag name="resrcFile" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`resrcfile_hypertextcontent`">
+			<key update="true">
+				<column name="`hypertextcontent_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="ResrcFile" unique="false">
+				<column name="`resrcfile_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</joined-subclass>
+	<joined-subclass entity-name="BlockFolder" abstract="false" lazy="false" extends="LearningObject" table="`blockfolder`">
+		<meta attribute="eclassName">BlockFolder</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="folderMeta" class="FolderMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`foldermeta_foldermeta_id`"/>
+		</many-to-one>
+		<list name="blockFolder" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`blockfolder_blockfolder_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`blockfolder_blockfolder_idx`"/>
+			<one-to-many class="BlockFolder"/>
+		</list>
+		<list name="block" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`blockfolder_block_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`blockfolder_block_idx`"/>
+			<one-to-many class="Block"/>
+		</list>
+		<many-to-one name="accessControl" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="Category" abstract="false" lazy="false" extends="LearningObject" table="`category`">
+		<meta attribute="eclassName">Category</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<list name="titleMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`category_titlemeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`category_titlemeta_idx`"/>
+			<one-to-many class="TitleMeta"/>
+		</list>
+		<list name="course" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`category_course_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`category_course_idx`"/>
+			<one-to-many class="Course"/>
+		</list>
+	</joined-subclass>
+	<class entity-name="CorrBlock" abstract="false" lazy="false" table="`corrblock`">
+		<meta attribute="eclassName">CorrBlock</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="presentationBlock" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`corrblock_presentationblock_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`corrblock_presentationblock_idx`"/>
+			<one-to-many class="PresentationBlock"/>
+		</list>
+		<list name="titleMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`corrblock_titlemeta_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`corrblock_titlemeta_idx`"/>
+			<one-to-many class="TitleMeta"/>
+		</list>
+	</class>
+	<joined-subclass entity-name="Course" abstract="false" lazy="false" extends="LearningObject" table="`course`">
+		<meta attribute="eclassName">Course</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="courseMeta" class="CourseMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`coursemeta_coursemeta_id`"/>
+		</many-to-one>
+		<bag name="externalMetadata" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`course_externalmetadata_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many class="ExternalMetadata"/>
+		</bag>
+		<many-to-one name="coursetype" class="Coursetype" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`coursetype_coursetype_e_id`"/>
+		</many-to-one>
+		<property name="outlineAsXml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`outlineasxml`"/>
+		</property>
+		<list name="module" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`course_module_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`course_module_idx`"/>
+			<one-to-many class="Module"/>
+		</list>
+	</joined-subclass>
+	<class entity-name="Item" abstract="false" lazy="false" table="`item`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="corrBlock" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`item_corrblock_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`item_corrblock_idx`"/>
+			<one-to-many class="CorrBlock"/>
+		</list>
+		<list name="childitems" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`item_childitems_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`item_childitems_idx`"/>
+			<one-to-many class="Item"/>
+		</list>
+		<property name="luRef" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`luref`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="LearningUnit" abstract="false" lazy="false" extends="LearningObject" table="`learningunit`">
+		<meta attribute="eclassName">LearningUnit</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="luMeta" class="LuMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`lumeta_lumeta_id`"/>
+		</many-to-one>
+		<bag name="externalMetadata" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`learningunit_externalmetadata_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many class="ExternalMetadata"/>
+		</bag>
+		<property name="treeAsXml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`treeasxml`"/>
+		</property>
+		<property name="luFile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lufile`"/>
+		</property>
+		<many-to-one name="accessControl" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+		<list name="item" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`learningunit_item_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`learningunit_item_idx`"/>
+			<one-to-many class="Item"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass entity-name="LuFolder" abstract="false" lazy="false" extends="LearningObject" table="`lufolder`">
+		<meta attribute="eclassName">LuFolder</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="folderMeta" class="FolderMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`foldermeta_foldermeta_id`"/>
+		</many-to-one>
+		<list name="luFolder" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`lufolder_lufolder_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`lufolder_lufolder_idx`"/>
+			<one-to-many class="LuFolder"/>
+		</list>
+		<list name="learningUnit" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`lufolder_learningunit_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`lufolder_learningunit_idx`"/>
+			<one-to-many class="LearningUnit"/>
+		</list>
+		<many-to-one name="accessControl" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="Module" abstract="false" lazy="false" extends="LearningObject" table="`module`">
+		<meta attribute="eclassName">Module</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="moduleMeta" class="ModuleMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`modulemeta_modulemeta_id`"/>
+		</many-to-one>
+		<bag name="externalMetadata" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`module_externalmetadata_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many class="ExternalMetadata"/>
+		</bag>
+		<many-to-one name="rootNode" class="Node" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`node_rootnode_e_id`"/>
+		</many-to-one>
+		<property name="moduleFile" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`modulefile`"/>
+		</property>
+		<property name="treeAsXml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`treeasxml`"/>
+		</property>
+		<many-to-one name="accessControl" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="ModuleFolder" abstract="false" lazy="false" extends="LearningObject" table="`modulefolder`">
+		<meta attribute="eclassName">ModuleFolder</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="folderMeta" class="FolderMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`foldermeta_foldermeta_id`"/>
+		</many-to-one>
+		<list name="moduleFolder" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`modulefolder_modulefolder_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`modulefolder_modulefolder_idx`"/>
+			<one-to-many class="ModuleFolder"/>
+		</list>
+		<list name="module" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`modulefolder_module_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`modulefolder_module_idx`"/>
+			<one-to-many class="Module"/>
+		</list>
+		<many-to-one name="accessControl" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="ResrcFolder" abstract="false" lazy="false" extends="LearningObject" table="`resrcfolder`">
+		<meta attribute="eclassName">ResrcFolder</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<many-to-one name="folderMeta" class="FolderMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`foldermeta_foldermeta_id`"/>
+		</many-to-one>
+		<list name="resrcFolder" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`resrcfolder_resrcfolder_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`resrcfolder_resrcfolder_idx`"/>
+			<one-to-many class="ResrcFolder"/>
+		</list>
+		<many-to-one name="accessControl" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+		<property name="deleteScheduled" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`deletescheduled`"/>
+		</property>
+		<list name="resrcFile" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`resrcfolder_resrcfile_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`resrcfolder_resrcfile_idx`"/>
+			<one-to-many class="ResrcFile"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass entity-name="Theme" abstract="false" lazy="false" extends="LearningObject" table="`theme`">
+		<meta attribute="eclassName">Theme</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<list name="simpleDidacMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`theme_simpledidacmeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`theme_simpledidacmeta_idx`"/>
+			<one-to-many class="SimpleDidacMeta"/>
+		</list>
+	</joined-subclass>
+	<class entity-name="PresentationBlock" abstract="false" lazy="false" table="`presentationblock`">
+		<meta attribute="eclassName">PresentationBlock</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="lod" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`lod`"/>
+		</property>
+		<property name="rendering" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`rendering`"/>
+		</property>
+		<many-to-one name="block" class="Block" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`block_block_id`"/>
+		</many-to-one>
+	</class>
+	<class name="lobj.Node" entity-name="Node" proxy="lobj.Node" abstract="true" lazy="true" table="`node`">
+		<meta attribute="eclassName">Node</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="visible" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`visible`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="ThemeNode" abstract="false" lazy="false" extends="Node" table="`themenode`">
+		<meta attribute="eclassName">ThemeNode</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`node_id`"/>
+		</key>
+		<many-to-one name="theme" class="Theme" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`theme_theme_id`"/>
+		</many-to-one>
+		<list name="childnodes" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`themenode_childnodes_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`themenode_childnodes_idx`"/>
+			<one-to-many class="Node"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass entity-name="LuNode" abstract="false" lazy="false" extends="Node" table="`lunode`">
+		<meta attribute="eclassName">LuNode</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`node_id`"/>
+		</key>
+		<many-to-one name="learningUnit" class="LearningUnit" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`learningunit_learningunit_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="ResrcFile" abstract="false" lazy="false" extends="LearningObject" table="`resrcfile`">
+		<meta attribute="eclassName">ResrcFile</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<array name="file" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`resrcfile_file_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`resrcfile_file_idx`"/>
+			<element type="byte"/>
+		</array>
+		<array name="file_tn" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`resrcfile_file_tn_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`resrcfile_file_tn_idx`"/>
+			<element type="byte"/>
+		</array>
+		<property name="originalextension" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`originalextension`"/>
+		</property>
+		<property name="filesize" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`filesize`"/>
+		</property>
+		<property name="resrcHref" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`resrchref`"/>
+		</property>
+		<many-to-one name="accesscontrol" class="AccessControl" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`accesscontrol_accesscontrol_e_id`"/>
+		</many-to-one>
+		<many-to-one name="resrcFiletype" class="ResrcFiletype" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`resrcfiletype_resrcfiletype_e_id`"/>
+		</many-to-one>
+		<many-to-one name="source" class="Source" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`source_source_e_id`"/>
+		</many-to-one>
+		<bag name="hypertextContent" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`resrcfile_hypertextcontent`">
+			<key update="true">
+				<column name="`resrcfile_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="HypertextContent" unique="false">
+				<column name="`hypertextcontent_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<many-to-one name="resrcMeta" class="ResrcMeta" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`resrcmeta_resrcmeta_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass entity-name="BlockAudiofile" abstract="false" lazy="false" extends="LearningObject" table="`blockaudiofile`">
+		<meta attribute="eclassName">BlockAudiofile</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<array name="file" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`blockaudiofile_file_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`blockaudiofile_file_idx`"/>
+			<element type="byte"/>
+		</array>
+		<property name="originalextension" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`originalextension`"/>
+		</property>
+		<property name="filesize" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`filesize`"/>
+		</property>
+		<property name="resrcHref" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`resrchref`"/>
+		</property>
+		<many-to-one name="resrcFiletype" class="ResrcFiletype" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`resrcfiletype_resrcfiletype_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class entity-name="ResrcFiletype" abstract="false" lazy="false" table="`resrcfiletype`">
+		<meta attribute="eclassName">ResrcFiletype</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="filetypeExtension" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`filetypeextension`"/>
+		</property>
+		<property name="filetypeDesc" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`filetypedesc`"/>
+		</property>
+		<property name="image" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`image`"/>
+		</property>
+		<property name="applet" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`applet`"/>
+		</property>
+		<property name="filetypeImageSmall" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`filetypeimagesmall`"/>
+		</property>
+		<property name="filetypeImageBif" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`filetypeimagebif`"/>
+		</property>
+	</class>
+	<class entity-name="AccessControl" abstract="false" lazy="false" table="`accesscontrol`">
+		<meta attribute="eclassName">AccessControl</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="owner" class="User" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`user_owner_e_id`"/>
+		</many-to-one>
+		<property name="lastModified" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`lastmodified`"/>
+		</property>
+		<many-to-one name="lastModifiedBy" class="User" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`user_lastmodifiedby_e_id`"/>
+		</many-to-one>
+		<property name="status" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`status`"/>
+		</property>
+		<property name="lastStatusChange" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`laststatuschange`"/>
+		</property>
+		<many-to-one name="lastStatusChangeBy" class="User" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`user_laststatuschangeby_e_id`"/>
+		</many-to-one>
+		<many-to-one name="sharednotes" class="Sharednotes" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`sharednotes_sharednotes_e_id`"/>
+		</many-to-one>
+		<list name="authorizes" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`accesscontrol_authorizes_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accesscontrol_authorizes_idx`"/>
+			<one-to-many class="Userauthorization"/>
+		</list>
+		<list name="editionHistory" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`accesscontrol_editionhistory_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`accesscontrol_editionhistory_idx`"/>
+			<one-to-many class="Edition"/>
+		</list>
+		<property name="globalAccess" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`globalaccess`"/>
+		</property>
+	</class>
+	<class entity-name="Address" abstract="false" lazy="false" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`street`"/>
+		</property>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`postcode`"/>
+		</property>
+		<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`city`"/>
+		</property>
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`state`"/>
+		</property>
+		<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`country`"/>
+		</property>
+		<property name="phone" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`phone`"/>
+		</property>
+		<property name="fax" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`fax`"/>
+		</property>
+		<property name="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="otheraddr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`otheraddr`"/>
+		</property>
+	</class>
+	<class entity-name="Affiliation" abstract="false" lazy="false" table="`affiliation`">
+		<meta attribute="eclassName">Affiliation</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="shortaffil" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`shortaffil`"/>
+		</property>
+		<property name="jobtitle" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`jobtitle`"/>
+		</property>
+		<property name="orgname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`orgname`"/>
+		</property>
+		<property name="orgdiv" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`orgdiv`"/>
+		</property>
+		<many-to-one name="address" class="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="Author" abstract="false" lazy="false" table="`author`">
+		<meta attribute="eclassName">Author</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="credittype" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`credittype`"/>
+		</property>
+		<many-to-one name="person" class="Person" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`person_person_e_id`"/>
+		</many-to-one>
+		<many-to-one name="address" class="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_id`"/>
+		</many-to-one>
+		<property name="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>
+	</class>
+	<joined-subclass entity-name="BlockMeta" abstract="false" lazy="false" extends="LearningObject" table="`blockmeta`">
+		<meta attribute="eclassName">BlockMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<property name="lod" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`lod`"/>
+		</property>
+		<property name="rendering" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`rendering`"/>
+		</property>
+		<many-to-one name="blocktype" class="Blocktype" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`blocktype_blocktype_e_id`"/>
+		</many-to-one>
+		<property name="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<property name="lastModified" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`lastmodified`"/>
+		</property>
+		<list name="simpleDidacMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`blockmeta_simpledidacmeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`blockmeta_simpledidacmeta_idx`"/>
+			<one-to-many class="SimpleDidacMeta"/>
+		</list>
+		<many-to-one name="defLang" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_deflang_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class entity-name="Blocktype" abstract="false" lazy="false" table="`blocktype`">
+		<meta attribute="eclassName">Blocktype</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<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="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<property name="styleRef" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`styleref`"/>
+		</property>
+		<bag name="domains" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`domain_blocktype`">
+			<key update="true">
+				<column name="`blocktype_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Domain" unique="false">
+				<column name="`domain_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class entity-name="TitleMeta" abstract="false" lazy="false" table="`titlemeta`">
+		<meta attribute="eclassName">TitleMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="language" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_language_e_id`"/>
+		</many-to-one>
+		<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>
+	<joined-subclass entity-name="CourseMeta" abstract="false" lazy="false" extends="LearningObject" table="`coursemeta`">
+		<meta attribute="eclassName">CourseMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<list name="didacMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`coursemeta_didacmeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`coursemeta_didacmeta_idx`"/>
+			<one-to-many class="DidacMeta"/>
+		</list>
+		<property name="hours" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`hours`"/>
+		</property>
+		<property name="lvanr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lvanr`"/>
+		</property>
+		<property name="columnfilterasxml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`columnfilterasxml`"/>
+		</property>
+		<property name="fromext" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`fromext`"/>
+		</property>
+		<property name="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<many-to-one name="lecturer" class="User" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`user_lecturer_e_id`"/>
+		</many-to-one>
+		<many-to-one name="defLang" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_deflang_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class entity-name="SimpleDidacMeta" abstract="false" lazy="false" table="`simpledidacmeta`">
+		<meta attribute="eclassName">SimpleDidacMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="language" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_language_e_id`"/>
+		</many-to-one>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="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="keywords" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`keywords`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="DidacMeta" abstract="false" lazy="false" extends="SimpleDidacMeta" table="`didacmeta`">
+		<meta attribute="eclassName">DidacMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`simpledidacmeta_id`"/>
+		</key>
+		<property name="goal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`goal`"/>
+		</property>
+		<many-to-one name="precognition" class="Precognition" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`precognition_precognition_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class entity-name="Domain" abstract="false" lazy="false" table="`domain`">
+		<meta attribute="eclassName">Domain</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<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>
+		<bag name="blocktypes" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`domain_blocktype`">
+			<key update="true">
+				<column name="`domain_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Blocktype" unique="false">
+				<column name="`blocktype_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<property name="serverURL" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`serverurl`"/>
+		</property>
+	</class>
+	<class entity-name="Edition" abstract="false" lazy="false" table="`edition`">
+		<meta attribute="eclassName">Edition</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="editionNr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`editionnr`"/>
+		</property>
+		<property name="editedBy" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`editedby`"/>
+		</property>
+		<property name="version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`version`"/>
+		</property>
+		<property name="lastVersionNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lastversionnumber`"/>
+		</property>
+		<property name="status" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`status`"/>
+		</property>
+		<property name="editionCreationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`editioncreationdate`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="FolderMeta" abstract="false" lazy="false" extends="LearningObject" table="`foldermeta`">
+		<meta attribute="eclassName">FolderMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="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="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+	</joined-subclass>
+	<joined-subclass entity-name="LuMeta" abstract="false" lazy="false" extends="LearningObject" table="`lumeta`">
+		<meta attribute="eclassName">LuMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<list name="didacMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`lumeta_didacmeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`lumeta_didacmeta_idx`"/>
+			<one-to-many class="DidacMeta"/>
+		</list>
+		<property name="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<many-to-one name="domain" class="Domain" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`domain_domain_id`"/>
+		</many-to-one>
+		<list name="authors" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`lumeta_authors_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`lumeta_authors_idx`"/>
+			<one-to-many class="Author"/>
+		</list>
+		<many-to-one name="publishInfo" class="PublishInfo" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`publishinfo_publishinfo_e_id`"/>
+		</many-to-one>
+		<many-to-one name="defLang" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_deflang_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class entity-name="Userauthorization" abstract="false" lazy="false" table="`userauthorization`">
+		<meta attribute="eclassName">Userauthorization</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="user" class="User" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`user_user_e_id`"/>
+		</many-to-one>
+		<many-to-one name="authType" class="AuthorizationTypes" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`authorizationtypes_authtype_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="Note" abstract="false" lazy="false" table="`note`">
+		<meta attribute="eclassName">Note</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`date`"/>
+		</property>
+		<property name="noteAuthor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`noteauthor`"/>
+		</property>
+		<property name="content" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`content`"/>
+		</property>
+	</class>
+	<class entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="honorific" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`honorific`"/>
+		</property>
+		<property name="firstname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`firstname`"/>
+		</property>
+		<property name="surname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`surname`"/>
+		</property>
+		<property name="contrib" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`contrib`"/>
+		</property>
+		<list name="affiliations" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`person_affiliations_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`person_affiliations_idx`"/>
+			<one-to-many class="Affiliation"/>
+		</list>
+		<property name="personblurb" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`personblurb`"/>
+		</property>
+	</class>
+	<class entity-name="Publisher" abstract="false" lazy="false" table="`publisher`">
+		<meta attribute="eclassName">Publisher</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="publishername" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`publishername`"/>
+		</property>
+		<many-to-one name="address" class="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`address_address_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="PublishInfo" abstract="false" lazy="false" table="`publishinfo`">
+		<meta attribute="eclassName">PublishInfo</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="edition" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`edition`"/>
+		</property>
+		<property name="pubdate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`pubdate`"/>
+		</property>
+		<many-to-one name="publisher" class="Publisher" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`publisher_publisher_id`"/>
+		</many-to-one>
+		<property name="pubsnumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`pubsnumber`"/>
+		</property>
+		<property name="releaseinfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`releaseinfo`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="ResrcMeta" abstract="false" lazy="false" extends="LearningObject" table="`resrcmeta`">
+		<meta attribute="eclassName">ResrcMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<property name="filename" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`filename`"/>
+		</property>
+		<property name="parameters" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`parameters`"/>
+		</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>
+		<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="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<property name="lastModified" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`lastmodified`"/>
+		</property>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="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="keywords" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`keywords`"/>
+		</property>
+	</joined-subclass>
+	<class entity-name="Sharednotes" abstract="false" lazy="false" table="`sharednotes`">
+		<meta attribute="eclassName">Sharednotes</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="notes" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`sharednotes_notes_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`sharednotes_notes_idx`"/>
+			<one-to-many class="Note"/>
+		</list>
+	</class>
+	<class entity-name="Coursetype" abstract="false" lazy="false" table="`coursetype`">
+		<meta attribute="eclassName">Coursetype</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="language" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_language_e_id`"/>
+		</many-to-one>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="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>
+	</class>
+	<class entity-name="ExternalMetadata" abstract="false" lazy="false" table="`externalmetadata`">
+		<meta attribute="eclassName">ExternalMetadata</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="ref" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ref`"/>
+		</property>
+		<property name="file" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`file`"/>
+		</property>
+	</class>
+	<class entity-name="Language" abstract="false" lazy="false" table="`language`">
+		<meta attribute="eclassName">Language</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="code" type="java.lang.String">
+			<column not-null="true" unique="false" name="`code`"/>
+		</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="language" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`language`"/>
+		</property>
+	</class>
+	<class entity-name="Precognition" abstract="false" lazy="false" table="`precognition`">
+		<meta attribute="eclassName">Precognition</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="precog" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`precog`"/>
+		</property>
+		<list name="internalRefs" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`precognition_internalrefs_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`precognition_internalrefs_idx`"/>
+			<one-to-many class="InternalRef"/>
+		</list>
+	</class>
+	<class entity-name="InternalRef" abstract="false" lazy="false" table="`internalref`">
+		<meta attribute="eclassName">InternalRef</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="language" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_language_code`"/>
+		</many-to-one>
+		<property name="ref" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ref`"/>
+		</property>
+		<property name="file" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`file`"/>
+		</property>
+		<property name="reftype" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`reftype`"/>
+		</property>
+	</class>
+	<joined-subclass entity-name="ModuleMeta" abstract="false" lazy="false" extends="LearningObject" table="`modulemeta`">
+		<meta attribute="eclassName">ModuleMeta</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<key>
+			<column name="`learningobject_id`"/>
+		</key>
+		<list name="didacMeta" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`modulemeta_didacmeta_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`modulemeta_didacmeta_idx`"/>
+			<one-to-many class="DidacMeta"/>
+		</list>
+		<property name="creationDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`creationdate`"/>
+		</property>
+		<list name="authors" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`modulemeta_authors_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`modulemeta_authors_idx`"/>
+			<one-to-many class="Author"/>
+		</list>
+		<many-to-one name="publishInfo" class="PublishInfo" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`publishinfo_publishinfo_id`"/>
+		</many-to-one>
+		<many-to-one name="defLang" class="Language" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`language_deflang_code`"/>
+		</many-to-one>
+	</joined-subclass>
+	<class entity-name="Source" abstract="false" lazy="false" table="`source`">
+		<meta attribute="eclassName">Source</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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" class="Author" cascade="all" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`author_author_id`"/>
+		</many-to-one>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="subtitle" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`subtitle`"/>
+		</property>
+		<property name="publishedIn" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`publishedin`"/>
+		</property>
+		<property name="publishedBy" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`publishedby`"/>
+		</property>
+		<property name="publishDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
+			<column not-null="false" unique="false" name="`publishdate`"/>
+		</property>
+		<property name="pp" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`pp`"/>
+		</property>
+	</class>
+	<class entity-name="AuthorizationTypes" abstract="false" lazy="false" table="`authorizationtypes`">
+		<meta attribute="eclassName">AuthorizationTypes</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="authType" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`authtype`"/>
+		</property>
+		<property name="authTypeDesc" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`authtypedesc`"/>
+		</property>
+		<property name="readOnly" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`readonly`"/>
+		</property>
+	</class>
+	<class entity-name="User" abstract="false" lazy="false" table="`user`">
+		<meta attribute="eclassName">User</meta>
+		<meta attribute="epackage">lobj.ecore</meta>
+		<id name="id" type="java.lang.String">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="loginname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`loginname`"/>
+		</property>
+		<property name="password" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`password`"/>
+		</property>
+		<property name="firstname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`firstname`"/>
+		</property>
+		<property name="lastname" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lastname`"/>
+		</property>
+		<property name="matriculationnr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`matriculationnr`"/>
+		</property>
+		<property name="scn" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`scn`"/>
+		</property>
+		<property name="icqnumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`icqnumber`"/>
+		</property>
+		<property name="icqpassword" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`icqpassword`"/>
+		</property>
+		<property name="entryasxml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`entryasxml`"/>
+		</property>
+		<property name="languagenr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`languagenr`"/>
+		</property>
+		<property name="notificationprofileasxml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`notificationprofileasxml`"/>
+		</property>
+		<property name="dossierasxml" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`dossierasxml`"/>
+		</property>
+		<array name="photo" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`user_photo_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`user_photo_idx`"/>
+			<element type="byte"/>
+		</array>
+		<property name="onlinestatus" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`onlinestatus`"/>
+		</property>
+		<property name="onlinedate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`onlinedate`"/>
+		</property>
+		<property name="datafilter" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`datafilter`"/>
+		</property>
+		<property name="inchatsince" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`inchatsince`"/>
+		</property>
+		<property name="contchatdate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`contchatdate`"/>
+		</property>
+		<property name="chatroomnr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`chatroomnr`"/>
+		</property>
+		<property name="fromext" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`fromext`"/>
+		</property>
+		<property name="lastlogindate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`lastlogindate`"/>
+		</property>
+		<property name="currlogindate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`currlogindate`"/>
+		</property>
+		<property name="lastcoursematerialnr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`lastcoursematerialnr`"/>
+		</property>
+		<property name="lastcoursematerialviewnr" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`lastcoursematerialviewnr`"/>
+		</property>
+		<property name="authenticateldap" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`authenticateldap`"/>
+		</property>
+		<property name="photochanged" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`photochanged`"/>
+		</property>
+		<list name="authorizations" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`user_authorizations_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`user_authorizations_idx`"/>
+			<one-to-many class="AuthorizationTypes"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ224991Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ224991Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ca223adc6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ224991Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,22 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz224991.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" discriminator-value="Parent" table="`parent`">
+		<meta attribute="eclassName">Parent</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz224991</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="parentdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.bz224991.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Parent" discriminator-value="Child">
+		<meta attribute="eclassName">Child</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz224991</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ224991Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ224991Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..daf2b8036
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ224991Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,22 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz224991.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" table="`parent`">
+		<meta attribute="eclassName" inherit="false">Parent</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz224991</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.bz224991.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Parent" table="`child`">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz224991</meta>
+		<key>
+			<column name="`mypk`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ224991Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ224991Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..daf2b8036
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ224991Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,22 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz224991.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" table="`parent`">
+		<meta attribute="eclassName" inherit="false">Parent</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz224991</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.bz224991.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Parent" table="`child`">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz224991</meta>
+		<key>
+			<column name="`mypk`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d8aabadce
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,45 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296.impl.BlockImpl" entity-name="Block" abstract="false" lazy="false" discriminator-value="Block" table="`block`">
+		<meta attribute="eclassName">Block</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</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="id" lazy="false" insert="true" update="true" not-null="true" unique="false" type="long">
+			<column not-null="true" unique="false" name="`id`"/>
+		</property>
+		<many-to-one name="vserver" entity-name="VServer" cascade="merge,persist,save-update,lock,refresh" foreign-key="block_vserver" lazy="false" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`block_vserver_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296.impl.VServerImpl" entity-name="VServer" abstract="false" lazy="false" discriminator-value="VServer" table="`vserver`">
+		<meta attribute="eclassName">VServer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</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="id" lazy="false" insert="true" update="true" not-null="true" unique="false" type="long">
+			<column not-null="true" unique="false" name="`id`"/>
+		</property>
+		<list name="blocks" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`block_vserver_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`vserver_blocks_idx`"/>
+			<one-to-many entity-name="Block"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7200dbc91
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,43 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296.impl.BlockImpl" entity-name="Block" abstract="false" lazy="false" table="`block`">
+		<meta attribute="eclassName">Block</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</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="id" lazy="false" insert="true" update="true" not-null="true" unique="false" type="long">
+			<column not-null="true" unique="false" name="`id`"/>
+		</property>
+		<many-to-one name="vserver" entity-name="VServer" cascade="merge,persist,save-update,lock,refresh" foreign-key="block_vserver" lazy="false" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`block_vserver_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296.impl.VServerImpl" entity-name="VServer" abstract="false" lazy="false" table="`vserver`">
+		<meta attribute="eclassName">VServer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</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="id" lazy="false" insert="true" update="true" not-null="true" unique="false" type="long">
+			<column not-null="true" unique="false" name="`id`"/>
+		</property>
+		<list name="blocks" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`block_vserver_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`vserver_blocks_idx`"/>
+			<one-to-many entity-name="Block"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7200dbc91
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,43 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296.impl.BlockImpl" entity-name="Block" abstract="false" lazy="false" table="`block`">
+		<meta attribute="eclassName">Block</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</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="id" lazy="false" insert="true" update="true" not-null="true" unique="false" type="long">
+			<column not-null="true" unique="false" name="`id`"/>
+		</property>
+		<many-to-one name="vserver" entity-name="VServer" cascade="merge,persist,save-update,lock,refresh" foreign-key="block_vserver" lazy="false" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`block_vserver_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296.impl.VServerImpl" entity-name="VServer" abstract="false" lazy="false" table="`vserver`">
+		<meta attribute="eclassName">VServer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</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="id" lazy="false" insert="true" update="true" not-null="true" unique="false" type="long">
+			<column not-null="true" unique="false" name="`id`"/>
+		</property>
+		<list name="blocks" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`block_vserver_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`vserver_blocks_idx`"/>
+			<one-to-many entity-name="Block"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296Action_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296Action_mysql_xjoin_hibernate.hbm.xml
new file mode 100755
index 000000000..bddce2c98
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296Action_mysql_xjoin_hibernate.hbm.xml
@@ -0,0 +1,36 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296.impl.BlockImpl" entity-name="Block" abstract="false" lazy="true" table="`ops_block`" proxy="org.eclipse.emf.teneo.samples.issues.bz225296.Block">
+		<meta attribute="eclassName">Block</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<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="vserver" entity-name="VServer" cascade="merge,persist,save-update,lock,refresh" foreign-key="block_vserver" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`vserver_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296.impl.VServerImpl" entity-name="VServer" abstract="false" lazy="false" table="`ops_vserver`">
+		<meta attribute="eclassName">VServer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<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>
+		<bag name="blocks" fetch="select" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`vserver_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Block"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296Action_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296Action_mysql_xsingle_hibernate.hbm.xml
new file mode 100755
index 000000000..28f5b9cf2
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296Action_mysql_xsingle_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296.impl.BlockImpl" entity-name="Block" abstract="false" lazy="true" discriminator-value="Block" table="`ops_block`" proxy="org.eclipse.emf.teneo.samples.issues.bz225296.Block">
+		<meta attribute="eclassName">Block</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<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="vserver" entity-name="VServer" cascade="merge,persist,save-update,lock,refresh" foreign-key="block_vserver" lazy="false" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`vserver_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296.impl.VServerImpl" entity-name="VServer" abstract="false" lazy="false" discriminator-value="VServer" table="`ops_vserver`">
+		<meta attribute="eclassName">VServer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<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>
+		<bag name="blocks" fetch="select" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`vserver_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Block"/>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296_2Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296_2Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..846933853
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296_2Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,622 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.BlockImpl" entity-name="Block" abstract="false" lazy="false" discriminator-value="Block" table="`ops_block`">
+		<meta attribute="eclassName">Block</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_blockdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<many-to-one name="vserver" entity-name="VServer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="block_vserver" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`vserver_id`"/>
+		</many-to-one>
+		<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="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="agent" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`agent`"/>
+		</property>
+		<property name="service" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`service`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DataCenterImpl" entity-name="DataCenter" abstract="false" lazy="false" discriminator-value="DataCenter" table="`ops_datacenter`">
+		<meta attribute="eclassName">DataCenter</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_datacenterdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="host" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`datacenter_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Host"/>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DomainImpl" entity-name="Domain" abstract="false" lazy="false" discriminator-value="Domain" table="`domain`">
+		<meta attribute="eclassName">Domain</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="domaindtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="systems" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`domain_system`">
+			<key update="true">
+				<column name="`domain_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="DomainSystem" unique="false" foreign-key="domain_systems">
+				<column name="`system_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DomainSystemImpl" entity-name="DomainSystem" abstract="false" lazy="false" discriminator-value="DomainSystem" table="`domainsystem`">
+		<meta attribute="eclassName">DomainSystem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="domainsystemdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</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>
+		<bag name="domains" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`domain_system`">
+			<key update="true">
+				<column name="`system_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Domain" unique="false" foreign-key="domainsystem_domains">
+				<column name="`domain_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="opsSystem" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_domainsystem_opssystem`">
+			<key update="true">
+				<column name="`domainsystem_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="OpsSystem" unique="false" foreign-key="domainsystem_opssystem">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<many-to-one name="interface" entity-name="Interface" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="domainsystem_interface" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`interface_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="forwardEmail" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`forwardemail`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.FailoverTypeImpl" entity-name="FailoverType" abstract="false" lazy="false" discriminator-value="FailoverType" table="`ops_failovertype`">
+		<meta attribute="eclassName">FailoverType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_failovertypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.HostImpl" entity-name="Host" abstract="false" lazy="false" discriminator-value="Host" table="`ops_host`">
+		<meta attribute="eclassName">Host</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_hostdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<many-to-one name="dataCenter" entity-name="DataCenter" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="host_datacenter" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`datacenter_id`"/>
+		</many-to-one>
+		<bag name="vserver" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`host_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<bag name="ip" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`host_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="IP"/>
+		</bag>
+		<many-to-one name="ownIp" entity-name="IP" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="host_ownip" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ownip_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+		<property name="network" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`network`" length="64000"/>
+		</property>
+		<property name="providerId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`providerid`" length="64000"/>
+		</property>
+		<many-to-one name="gateway" entity-name="IP" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="host_gateway" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ip_gateway_id`"/>
+		</many-to-one>
+		<bag name="block" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`host_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="HostBlock"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.HostBlockImpl" entity-name="HostBlock" abstract="false" lazy="false" discriminator-value="HostBlock" table="`ops_hostblock`">
+		<meta attribute="eclassName">HostBlock</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_hostblockdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<many-to-one name="host" entity-name="Host" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="hostblock_host" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_id`"/>
+		</many-to-one>
+		<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="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="agent" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`agent`"/>
+		</property>
+		<property name="service" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`service`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.InterfaceImpl" entity-name="Interface" abstract="false" lazy="false" discriminator-value="Interface" table="`ops_interface`">
+		<meta attribute="eclassName">Interface</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_interfacedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="role" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_role_interface`">
+			<key update="true">
+				<column name="`interface_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Role" unique="false" foreign-key="interface_role">
+				<column name="`role_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="domainSystem" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`interface_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="DomainSystem"/>
+		</bag>
+		<many-to-one name="failoverType" entity-name="FailoverType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="interface_failovertype" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`failovertype_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="port" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`port`"/>
+		</property>
+		<property name="external" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`external`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.IPImpl" entity-name="IP" abstract="false" lazy="false" discriminator-value="IP" table="`ops_ip`">
+		<meta attribute="eclassName">IP</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_ipdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<property name="ip" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`ip`"/>
+		</property>
+		<many-to-one name="host" entity-name="Host" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ip_host" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_id`"/>
+		</many-to-one>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.IpType</param>
+				<param name="eclassifier">IpType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</param>
+			</type>
+		</property>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="shared" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`shared`"/>
+		</property>
+		<bag name="ipName" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_ip_ipname`">
+			<key update="true">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="IPName" unique="false" foreign-key="ip_ipname">
+				<column name="`ipname_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="vserver" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_vserver_ip`">
+			<key update="true">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="VServer" unique="false" foreign-key="ip_vserver">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.MuninInfoImpl" entity-name="MuninInfo" abstract="false" lazy="false" discriminator-value="MuninInfo" table="`ops_munininfo`">
+		<meta attribute="eclassName">MuninInfo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_munininfodtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="pluginName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`pluginname`" length="64000"/>
+		</property>
+		<property name="warningLevel" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`warninglevel`"/>
+		</property>
+		<property name="criticalLevel" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`criticallevel`"/>
+		</property>
+		<property name="monitorableByNagios" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`monitorablebynagios`"/>
+		</property>
+		<property name="displaySummary" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`displaysummary`"/>
+		</property>
+		<many-to-one name="role" entity-name="Role" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="munininfo_role" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`role_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.IPNameImpl" entity-name="IPName" abstract="false" lazy="false" discriminator-value="IPName" table="`ops_ipname`">
+		<meta attribute="eclassName">IPName</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_ipnamedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="ip" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_ip_ipname`">
+			<key update="true">
+				<column name="`ipname_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="IP" unique="false" foreign-key="ipname_ip">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.ParameterImpl" entity-name="Parameter" abstract="false" lazy="false" discriminator-value="Parameter" table="`ops_parameter`">
+		<meta attribute="eclassName">Parameter</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_parameterdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`key`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`value`" length="64000"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.RoleImpl" entity-name="Role" abstract="false" lazy="false" discriminator-value="Role" table="`ops_role`">
+		<meta attribute="eclassName">Role</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_roledtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="interface" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_role_interface`">
+			<key update="true">
+				<column name="`role_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Interface" unique="false" foreign-key="role_interface">
+				<column name="`interface_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="vserver" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`role_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<bag name="requiredInterface" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_role_requredinterface`">
+			<key update="true">
+				<column name="`role_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Interface" unique="false" foreign-key="role_requiredinterface">
+				<column name="`interface_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<bag name="muninInfo" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`role_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="MuninInfo"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.OpsSystemImpl" entity-name="OpsSystem" abstract="false" lazy="false" discriminator-value="OpsSystem" table="`ops_opssystem`">
+		<meta attribute="eclassName">OpsSystem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_opssystemdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="ownVserver" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`own_opssystem_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<bag name="servingVserver" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_vserver_opssystem`">
+			<key update="true">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="VServer" unique="false" foreign-key="opssystem_servingvserver">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="domainSystem" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_domainsystem_opssystem`">
+			<key update="true">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="DomainSystem" unique="false" foreign-key="opssystem_domainsystem">
+				<column name="`domainsystem_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.VServerImpl" entity-name="VServer" abstract="false" lazy="false" discriminator-value="VServer" table="`ops_vserver`">
+		<meta attribute="eclassName">VServer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_vserverdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="block" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`vserver_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Block"/>
+		</bag>
+		<many-to-one name="ownSystem" entity-name="OpsSystem" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vserver_ownsystem" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`own_opssystem_id`"/>
+		</many-to-one>
+		<bag name="servedSystem" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_vserver_opssystem`">
+			<key update="true">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="OpsSystem" unique="false" foreign-key="vserver_servedsystem">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="ip" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_vserver_ip`">
+			<key update="true">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="IP" unique="false" foreign-key="vserver_ip">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<many-to-one name="host" entity-name="Host" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vserver_host" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_id`"/>
+		</many-to-one>
+		<many-to-one name="role" entity-name="Role" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vserver_role" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`role_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DWHClusterImpl" entity-name="DWHCluster" abstract="false" lazy="false" discriminator-value="DWHCluster" table="`ops_dwhcluster`">
+		<meta attribute="eclassName">DWHCluster</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_dwhclusterdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="instance" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="dwhcluster_instance">
+				<column name="`dwhcluster_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="DWHInstance"/>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DWHInstanceImpl" entity-name="DWHInstance" abstract="false" lazy="false" discriminator-value="DWHInstance" table="`ops_dwhinstance`">
+		<meta attribute="eclassName">DWHInstance</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_dwhinstancedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="etl" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="dwhinstance_etl">
+				<column name="`dwhinstance_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296_2Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296_2Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..19d0cc96e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296_2Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,571 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.BlockImpl" entity-name="Block" abstract="false" lazy="false" table="`ops_block`">
+		<meta attribute="eclassName" inherit="false">Block</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<many-to-one name="vserver" entity-name="VServer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="block_vserver" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`vserver_id`"/>
+		</many-to-one>
+		<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="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="agent" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`agent`"/>
+		</property>
+		<property name="service" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`service`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DataCenterImpl" entity-name="DataCenter" abstract="false" lazy="false" table="`ops_datacenter`">
+		<meta attribute="eclassName" inherit="false">DataCenter</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="host" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`datacenter_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Host"/>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DomainImpl" entity-name="Domain" abstract="false" lazy="false" table="`domain`">
+		<meta attribute="eclassName" inherit="false">Domain</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="systems" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`domain_system`">
+			<key update="true">
+				<column name="`domain_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="DomainSystem" unique="false" foreign-key="domain_systems">
+				<column name="`system_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DomainSystemImpl" entity-name="DomainSystem" abstract="false" lazy="false" table="`domainsystem`">
+		<meta attribute="eclassName" inherit="false">DomainSystem</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</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>
+		<bag name="domains" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`domain_system`">
+			<key update="true">
+				<column name="`system_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Domain" unique="false" foreign-key="domainsystem_domains">
+				<column name="`domain_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="opsSystem" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_domainsystem_opssystem`">
+			<key update="true">
+				<column name="`domainsystem_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="OpsSystem" unique="false" foreign-key="domainsystem_opssystem">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<many-to-one name="interface" entity-name="Interface" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="domainsystem_interface" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`interface_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="forwardEmail" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`forwardemail`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.FailoverTypeImpl" entity-name="FailoverType" abstract="false" lazy="false" table="`ops_failovertype`">
+		<meta attribute="eclassName" inherit="false">FailoverType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.HostImpl" entity-name="Host" abstract="false" lazy="false" table="`ops_host`">
+		<meta attribute="eclassName" inherit="false">Host</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<many-to-one name="dataCenter" entity-name="DataCenter" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="host_datacenter" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`datacenter_id`"/>
+		</many-to-one>
+		<bag name="vserver" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`host_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<bag name="ip" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`host_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="IP"/>
+		</bag>
+		<many-to-one name="ownIp" entity-name="IP" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="host_ownip" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ownip_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+		<property name="network" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`network`" length="64000"/>
+		</property>
+		<property name="providerId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`providerid`" length="64000"/>
+		</property>
+		<many-to-one name="gateway" entity-name="IP" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="host_gateway" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ip_gateway_id`"/>
+		</many-to-one>
+		<bag name="block" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`host_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="HostBlock"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.HostBlockImpl" entity-name="HostBlock" abstract="false" lazy="false" table="`ops_hostblock`">
+		<meta attribute="eclassName" inherit="false">HostBlock</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<many-to-one name="host" entity-name="Host" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="hostblock_host" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_id`"/>
+		</many-to-one>
+		<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="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="agent" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`agent`"/>
+		</property>
+		<property name="service" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`service`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.InterfaceImpl" entity-name="Interface" abstract="false" lazy="false" table="`ops_interface`">
+		<meta attribute="eclassName" inherit="false">Interface</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="role" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_role_interface`">
+			<key update="true">
+				<column name="`interface_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Role" unique="false" foreign-key="interface_role">
+				<column name="`role_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="domainSystem" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`interface_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="DomainSystem"/>
+		</bag>
+		<many-to-one name="failoverType" entity-name="FailoverType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="interface_failovertype" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`failovertype_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="port" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`port`"/>
+		</property>
+		<property name="external" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`external`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.IPImpl" entity-name="IP" abstract="false" lazy="false" table="`ops_ip`">
+		<meta attribute="eclassName" inherit="false">IP</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<property name="ip" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`ip`"/>
+		</property>
+		<many-to-one name="host" entity-name="Host" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ip_host" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_id`"/>
+		</many-to-one>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.IpType</param>
+				<param name="eclassifier">IpType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</param>
+			</type>
+		</property>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="shared" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`shared`"/>
+		</property>
+		<bag name="ipName" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_ip_ipname`">
+			<key update="true">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="IPName" unique="false" foreign-key="ip_ipname">
+				<column name="`ipname_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="vserver" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_vserver_ip`">
+			<key update="true">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="VServer" unique="false" foreign-key="ip_vserver">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.MuninInfoImpl" entity-name="MuninInfo" abstract="false" lazy="false" table="`ops_munininfo`">
+		<meta attribute="eclassName" inherit="false">MuninInfo</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="pluginName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`pluginname`" length="64000"/>
+		</property>
+		<property name="warningLevel" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`warninglevel`"/>
+		</property>
+		<property name="criticalLevel" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`criticallevel`"/>
+		</property>
+		<property name="monitorableByNagios" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`monitorablebynagios`"/>
+		</property>
+		<property name="displaySummary" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`displaysummary`"/>
+		</property>
+		<many-to-one name="role" entity-name="Role" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="munininfo_role" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`role_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.IPNameImpl" entity-name="IPName" abstract="false" lazy="false" table="`ops_ipname`">
+		<meta attribute="eclassName" inherit="false">IPName</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="ip" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_ip_ipname`">
+			<key update="true">
+				<column name="`ipname_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="IP" unique="false" foreign-key="ipname_ip">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.ParameterImpl" entity-name="Parameter" abstract="false" lazy="false" table="`ops_parameter`">
+		<meta attribute="eclassName" inherit="false">Parameter</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`key`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`value`" length="64000"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.RoleImpl" entity-name="Role" abstract="false" lazy="false" table="`ops_role`">
+		<meta attribute="eclassName" inherit="false">Role</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="interface" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_role_interface`">
+			<key update="true">
+				<column name="`role_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Interface" unique="false" foreign-key="role_interface">
+				<column name="`interface_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="vserver" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`role_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<bag name="requiredInterface" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_role_requredinterface`">
+			<key update="true">
+				<column name="`role_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Interface" unique="false" foreign-key="role_requiredinterface">
+				<column name="`interface_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<bag name="muninInfo" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`role_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="MuninInfo"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.OpsSystemImpl" entity-name="OpsSystem" abstract="false" lazy="false" table="`ops_opssystem`">
+		<meta attribute="eclassName" inherit="false">OpsSystem</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="ownVserver" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`own_opssystem_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<bag name="servingVserver" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_vserver_opssystem`">
+			<key update="true">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="VServer" unique="false" foreign-key="opssystem_servingvserver">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="domainSystem" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_domainsystem_opssystem`">
+			<key update="true">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="DomainSystem" unique="false" foreign-key="opssystem_domainsystem">
+				<column name="`domainsystem_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.VServerImpl" entity-name="VServer" abstract="false" lazy="false" table="`ops_vserver`">
+		<meta attribute="eclassName" inherit="false">VServer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="block" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`vserver_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Block"/>
+		</bag>
+		<many-to-one name="ownSystem" entity-name="OpsSystem" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vserver_ownsystem" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`own_opssystem_id`"/>
+		</many-to-one>
+		<bag name="servedSystem" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_vserver_opssystem`">
+			<key update="true">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="OpsSystem" unique="false" foreign-key="vserver_servedsystem">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="ip" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_vserver_ip`">
+			<key update="true">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="IP" unique="false" foreign-key="vserver_ip">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<many-to-one name="host" entity-name="Host" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vserver_host" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_id`"/>
+		</many-to-one>
+		<many-to-one name="role" entity-name="Role" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vserver_role" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`role_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DWHClusterImpl" entity-name="DWHCluster" abstract="false" lazy="false" table="`ops_dwhcluster`">
+		<meta attribute="eclassName" inherit="false">DWHCluster</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="instance" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="dwhcluster_instance">
+				<column name="`dwhcluster_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="DWHInstance"/>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DWHInstanceImpl" entity-name="DWHInstance" abstract="false" lazy="false" table="`ops_dwhinstance`">
+		<meta attribute="eclassName" inherit="false">DWHInstance</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="etl" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="dwhinstance_etl">
+				<column name="`dwhinstance_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296_2Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296_2Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..19d0cc96e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296_2Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,571 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.BlockImpl" entity-name="Block" abstract="false" lazy="false" table="`ops_block`">
+		<meta attribute="eclassName" inherit="false">Block</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<many-to-one name="vserver" entity-name="VServer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="block_vserver" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`vserver_id`"/>
+		</many-to-one>
+		<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="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="agent" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`agent`"/>
+		</property>
+		<property name="service" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`service`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DataCenterImpl" entity-name="DataCenter" abstract="false" lazy="false" table="`ops_datacenter`">
+		<meta attribute="eclassName" inherit="false">DataCenter</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="host" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`datacenter_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Host"/>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DomainImpl" entity-name="Domain" abstract="false" lazy="false" table="`domain`">
+		<meta attribute="eclassName" inherit="false">Domain</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="systems" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`domain_system`">
+			<key update="true">
+				<column name="`domain_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="DomainSystem" unique="false" foreign-key="domain_systems">
+				<column name="`system_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DomainSystemImpl" entity-name="DomainSystem" abstract="false" lazy="false" table="`domainsystem`">
+		<meta attribute="eclassName" inherit="false">DomainSystem</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</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>
+		<bag name="domains" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`domain_system`">
+			<key update="true">
+				<column name="`system_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Domain" unique="false" foreign-key="domainsystem_domains">
+				<column name="`domain_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="opsSystem" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_domainsystem_opssystem`">
+			<key update="true">
+				<column name="`domainsystem_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="OpsSystem" unique="false" foreign-key="domainsystem_opssystem">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<many-to-one name="interface" entity-name="Interface" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="domainsystem_interface" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`interface_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="forwardEmail" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`forwardemail`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.FailoverTypeImpl" entity-name="FailoverType" abstract="false" lazy="false" table="`ops_failovertype`">
+		<meta attribute="eclassName" inherit="false">FailoverType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.HostImpl" entity-name="Host" abstract="false" lazy="false" table="`ops_host`">
+		<meta attribute="eclassName" inherit="false">Host</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<many-to-one name="dataCenter" entity-name="DataCenter" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="host_datacenter" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`datacenter_id`"/>
+		</many-to-one>
+		<bag name="vserver" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`host_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<bag name="ip" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`host_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="IP"/>
+		</bag>
+		<many-to-one name="ownIp" entity-name="IP" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="host_ownip" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ownip_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+		<property name="network" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`network`" length="64000"/>
+		</property>
+		<property name="providerId" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`providerid`" length="64000"/>
+		</property>
+		<many-to-one name="gateway" entity-name="IP" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="host_gateway" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ip_gateway_id`"/>
+		</many-to-one>
+		<bag name="block" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`host_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="HostBlock"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.HostBlockImpl" entity-name="HostBlock" abstract="false" lazy="false" table="`ops_hostblock`">
+		<meta attribute="eclassName" inherit="false">HostBlock</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<many-to-one name="host" entity-name="Host" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="hostblock_host" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_id`"/>
+		</many-to-one>
+		<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="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="agent" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`agent`"/>
+		</property>
+		<property name="service" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`service`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.InterfaceImpl" entity-name="Interface" abstract="false" lazy="false" table="`ops_interface`">
+		<meta attribute="eclassName" inherit="false">Interface</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="role" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_role_interface`">
+			<key update="true">
+				<column name="`interface_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Role" unique="false" foreign-key="interface_role">
+				<column name="`role_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="domainSystem" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`interface_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="DomainSystem"/>
+		</bag>
+		<many-to-one name="failoverType" entity-name="FailoverType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="interface_failovertype" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`failovertype_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="port" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`port`"/>
+		</property>
+		<property name="external" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`external`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.IPImpl" entity-name="IP" abstract="false" lazy="false" table="`ops_ip`">
+		<meta attribute="eclassName" inherit="false">IP</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<property name="ip" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`ip`"/>
+		</property>
+		<many-to-one name="host" entity-name="Host" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ip_host" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_id`"/>
+		</many-to-one>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.IpType</param>
+				<param name="eclassifier">IpType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</param>
+			</type>
+		</property>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="shared" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`shared`"/>
+		</property>
+		<bag name="ipName" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_ip_ipname`">
+			<key update="true">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="IPName" unique="false" foreign-key="ip_ipname">
+				<column name="`ipname_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="vserver" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_vserver_ip`">
+			<key update="true">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="VServer" unique="false" foreign-key="ip_vserver">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.MuninInfoImpl" entity-name="MuninInfo" abstract="false" lazy="false" table="`ops_munininfo`">
+		<meta attribute="eclassName" inherit="false">MuninInfo</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="pluginName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`pluginname`" length="64000"/>
+		</property>
+		<property name="warningLevel" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`warninglevel`"/>
+		</property>
+		<property name="criticalLevel" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`criticallevel`"/>
+		</property>
+		<property name="monitorableByNagios" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`monitorablebynagios`"/>
+		</property>
+		<property name="displaySummary" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`displaysummary`"/>
+		</property>
+		<many-to-one name="role" entity-name="Role" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="munininfo_role" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`role_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.IPNameImpl" entity-name="IPName" abstract="false" lazy="false" table="`ops_ipname`">
+		<meta attribute="eclassName" inherit="false">IPName</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="ip" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_ip_ipname`">
+			<key update="true">
+				<column name="`ipname_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="IP" unique="false" foreign-key="ipname_ip">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.ParameterImpl" entity-name="Parameter" abstract="false" lazy="false" table="`ops_parameter`">
+		<meta attribute="eclassName" inherit="false">Parameter</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`key`"/>
+		</property>
+		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`value`" length="64000"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.RoleImpl" entity-name="Role" abstract="false" lazy="false" table="`ops_role`">
+		<meta attribute="eclassName" inherit="false">Role</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="interface" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_role_interface`">
+			<key update="true">
+				<column name="`role_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Interface" unique="false" foreign-key="role_interface">
+				<column name="`interface_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="vserver" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`role_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<bag name="requiredInterface" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_role_requredinterface`">
+			<key update="true">
+				<column name="`role_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Interface" unique="false" foreign-key="role_requiredinterface">
+				<column name="`interface_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<bag name="muninInfo" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`role_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="MuninInfo"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.OpsSystemImpl" entity-name="OpsSystem" abstract="false" lazy="false" table="`ops_opssystem`">
+		<meta attribute="eclassName" inherit="false">OpsSystem</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="ownVserver" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`own_opssystem_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<bag name="servingVserver" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_vserver_opssystem`">
+			<key update="true">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="VServer" unique="false" foreign-key="opssystem_servingvserver">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="domainSystem" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_domainsystem_opssystem`">
+			<key update="true">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="DomainSystem" unique="false" foreign-key="opssystem_domainsystem">
+				<column name="`domainsystem_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.VServerImpl" entity-name="VServer" abstract="false" lazy="false" table="`ops_vserver`">
+		<meta attribute="eclassName" inherit="false">VServer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="block" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`vserver_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Block"/>
+		</bag>
+		<many-to-one name="ownSystem" entity-name="OpsSystem" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vserver_ownsystem" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`own_opssystem_id`"/>
+		</many-to-one>
+		<bag name="servedSystem" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_vserver_opssystem`">
+			<key update="true">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="OpsSystem" unique="false" foreign-key="vserver_servedsystem">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="ip" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_vserver_ip`">
+			<key update="true">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="IP" unique="false" foreign-key="vserver_ip">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<many-to-one name="host" entity-name="Host" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vserver_host" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_id`"/>
+		</many-to-one>
+		<many-to-one name="role" entity-name="Role" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vserver_role" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`role_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DWHClusterImpl" entity-name="DWHCluster" abstract="false" lazy="false" table="`ops_dwhcluster`">
+		<meta attribute="eclassName" inherit="false">DWHCluster</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`name`"/>
+		</property>
+		<bag name="instance" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="dwhcluster_instance">
+				<column name="`dwhcluster_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="DWHInstance"/>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DWHInstanceImpl" entity-name="DWHInstance" abstract="false" lazy="false" table="`ops_dwhinstance`">
+		<meta attribute="eclassName" inherit="false">DWHInstance</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="etl" fetch="subselect" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="dwhinstance_etl">
+				<column name="`dwhinstance_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296_2Action_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296_2Action_mysql_xjoin_hibernate.hbm.xml
new file mode 100755
index 000000000..621a75671
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296_2Action_mysql_xjoin_hibernate.hbm.xml
@@ -0,0 +1,583 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.BlockImpl" entity-name="Block" abstract="false" lazy="true" table="`ops_block`" proxy="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.Block">
+		<meta attribute="eclassName">Block</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<many-to-one name="vserver" entity-name="VServer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="block_vserver" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`vserver_id`"/>
+		</many-to-one>
+		<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="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="agent" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`agent`"/>
+		</property>
+		<property name="service" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`service`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DataCenterImpl" entity-name="DataCenter" abstract="false" lazy="false" table="`ops_datacenter`">
+		<meta attribute="eclassName">DataCenter</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="host" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`datacenter_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Host"/>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DomainImpl" entity-name="Domain" abstract="false" lazy="false" table="`domain`">
+		<meta attribute="eclassName">Domain</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="systems" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`domain_system`">
+			<key update="true">
+				<column name="`domain_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="DomainSystem" unique="false" foreign-key="domain_systems">
+				<column name="`domainsystem_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DomainSystemImpl" entity-name="DomainSystem" abstract="false" lazy="false" table="`domainsystem`">
+		<meta attribute="eclassName">DomainSystem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<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>
+		<bag name="domains" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`domain_system`">
+			<key update="true">
+				<column name="`system_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Domain" unique="false" foreign-key="domainsystem_domains">
+				<column name="`domain_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="opsSystem" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_domainsystem_opssystem`">
+			<key update="true">
+				<column name="`domainsystem_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="OpsSystem" unique="false" foreign-key="domainsystem_opssystem">
+				<column name="`system_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<many-to-one name="interface" entity-name="Interface" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="domainsystem_interface" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`interface_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="forwardEmail" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`forwardemail`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.FailoverTypeImpl" entity-name="FailoverType" abstract="false" lazy="false" table="`ops_failovertype`">
+		<meta attribute="eclassName">FailoverType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.HostImpl" entity-name="Host" abstract="false" lazy="false" table="`ops_host`">
+		<meta attribute="eclassName">Host</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="dataCenter" entity-name="DataCenter" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="host_datacenter" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_datacenter_id`"/>
+		</many-to-one>
+		<bag name="vserver" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`host_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<bag name="ip" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`host_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="IP"/>
+		</bag>
+		<many-to-one name="ownIp" entity-name="IP" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="host_ownip" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ownip_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+		<property name="network" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`network`" length="64000"/>
+		</property>
+		<property name="providerId" lazy="false" insert="true" update="true" not-null="false" unique="true" type="text">
+			<column not-null="false" unique="true" name="`providerid`" length="64000"/>
+		</property>
+		<many-to-one name="gateway" entity-name="IP" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="host_gateway" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ip_gateway_id`"/>
+		</many-to-one>
+		<bag name="block" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`host_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="HostBlock"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.HostBlockImpl" entity-name="HostBlock" abstract="false" lazy="false" table="`ops_hostblock`">
+		<meta attribute="eclassName">HostBlock</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<many-to-one name="host" entity-name="Host" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="hostblock_host" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_id`"/>
+		</many-to-one>
+		<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="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="agent" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`agent`"/>
+		</property>
+		<property name="service" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`service`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.InterfaceImpl" entity-name="Interface" abstract="false" lazy="false" table="`ops_interface`">
+		<meta attribute="eclassName">Interface</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="role" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_role_interface`">
+			<key update="true">
+				<column name="`interface_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Role" unique="false" foreign-key="interface_role">
+				<column name="`role_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="domainSystem" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`interface_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="DomainSystem"/>
+		</bag>
+		<many-to-one name="failoverType" entity-name="FailoverType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="interface_failovertype" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`failovertype_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="port" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`port`"/>
+		</property>
+		<property name="external" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`external`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.IPImpl" entity-name="IP" abstract="false" lazy="false" table="`ops_ip`">
+		<meta attribute="eclassName">IP</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="ip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ip`"/>
+		</property>
+		<many-to-one name="host" entity-name="Host" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ip_host" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_id`"/>
+		</many-to-one>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.IpType</param>
+				<param name="eclassifier">IpType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</param>
+			</type>
+		</property>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="shared" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`shared`"/>
+		</property>
+		<bag name="ipName" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_ip_ipname`">
+			<key update="true">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="IPName" unique="false" foreign-key="ip_ipname">
+				<column name="`ipname_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="vserver" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_vserver_ip`">
+			<key update="true">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="VServer" unique="false" foreign-key="ip_vserver">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.MuninInfoImpl" entity-name="MuninInfo" abstract="false" lazy="false" table="`ops_munininfo`">
+		<meta attribute="eclassName">MuninInfo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="pluginName" lazy="false" insert="true" update="true" not-null="false" unique="true" type="text">
+			<column not-null="false" unique="true" name="`pluginname`" length="64000"/>
+		</property>
+		<property name="warningLevel" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`warninglevel`"/>
+		</property>
+		<property name="criticalLevel" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`criticallevel`"/>
+		</property>
+		<property name="monitorableByNagios" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`monitorablebynagios`"/>
+		</property>
+		<property name="displaySummary" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`displaysummary`"/>
+		</property>
+		<many-to-one name="role" entity-name="Role" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="munininfo_role" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`role_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.IPNameImpl" entity-name="IPName" abstract="false" lazy="false" table="`ops_ipname`">
+		<meta attribute="eclassName">IPName</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</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>
+		<bag name="ip" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_ip_ipname`">
+			<key update="true">
+				<column name="`ipname_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="IP" unique="false" foreign-key="ipname_ip">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.ParameterImpl" entity-name="Parameter" abstract="false" lazy="false" table="`ops_parameter`">
+		<meta attribute="eclassName">Parameter</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<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>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.RoleImpl" entity-name="Role" abstract="false" lazy="false" table="`ops_role`">
+		<meta attribute="eclassName">Role</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="interface" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_role_interface`">
+			<key update="true">
+				<column name="`role_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Interface" unique="false" foreign-key="role_interface">
+				<column name="`interface_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="vserver" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`role_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<bag name="requiredInterface" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_role_requredinterface`">
+			<key update="true">
+				<column name="`role_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Interface" unique="false" foreign-key="role_requiredinterface"/>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<bag name="muninInfo" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`role_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="MuninInfo"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.OpsSystemImpl" entity-name="OpsSystem" abstract="false" lazy="false" table="`ops_opssystem`">
+		<meta attribute="eclassName">OpsSystem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="ownVserver" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`own_opssystem_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<bag name="servingVserver" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_vserver_opssystem`">
+			<key update="true">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="VServer" unique="false" foreign-key="opssystem_servingvserver">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="domainSystem" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_domainsystem_opssystem`">
+			<key update="true">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="DomainSystem" unique="false" foreign-key="opssystem_domainsystem">
+				<column name="`domainsystem_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.VServerImpl" entity-name="VServer" abstract="false" lazy="false" table="`ops_vserver`">
+		<meta attribute="eclassName">VServer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="block" fetch="select" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`vserver_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Block"/>
+		</bag>
+		<many-to-one name="ownSystem" entity-name="OpsSystem" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vserver_ownsystem" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`own_opssystem_id`"/>
+		</many-to-one>
+		<bag name="servedSystem" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_vserver_opssystem`">
+			<key update="true">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="OpsSystem" unique="false" foreign-key="vserver_servedsystem">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="ip" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_vserver_ip`">
+			<key update="true">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="IP" unique="false" foreign-key="vserver_ip">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<many-to-one name="host" entity-name="Host" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vserver_host" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_id`"/>
+		</many-to-one>
+		<many-to-one name="role" entity-name="Role" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vserver_role" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`role_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DWHClusterImpl" entity-name="DWHCluster" abstract="false" lazy="false" table="`dwhcluster`">
+		<meta attribute="eclassName">DWHCluster</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="instance" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="dwhcluster_instance">
+				<column name="`dwhcluster_instance_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`dwhcluster_instance_idx`"/>
+			<one-to-many entity-name="DWHInstance"/>
+		</list>
+		<property name="id" lazy="false" insert="true" update="true" not-null="true" unique="false" type="long">
+			<column not-null="true" unique="false" name="`id`"/>
+		</property>
+		<property name="modified" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`"/>
+		</property>
+		<property name="revision" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`revision`"/>
+		</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>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DWHInstanceImpl" entity-name="DWHInstance" abstract="false" lazy="false" table="`dwhinstance`">
+		<meta attribute="eclassName">DWHInstance</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</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="id" lazy="false" insert="true" update="true" not-null="true" unique="false" type="long">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="etl" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="dwhinstance_etl">
+				<column name="`dwhinstance_etl_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`dwhinstance_etl_idx`"/>
+			<one-to-many entity-name="VServer"/>
+		</list>
+		<property name="modified" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`"/>
+		</property>
+		<property name="revision" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`revision`"/>
+		</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>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296_2Action_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296_2Action_mysql_xsingle_hibernate.hbm.xml
new file mode 100755
index 000000000..e2e6d067b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ225296_2Action_mysql_xsingle_hibernate.hbm.xml
@@ -0,0 +1,634 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.BlockImpl" entity-name="Block" abstract="false" lazy="true" discriminator-value="Block" table="`ops_block`" proxy="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.Block">
+		<meta attribute="eclassName">Block</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_blockdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<many-to-one name="vserver" entity-name="VServer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="block_vserver" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`vserver_id`"/>
+		</many-to-one>
+		<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="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="agent" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`agent`"/>
+		</property>
+		<property name="service" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`service`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DataCenterImpl" entity-name="DataCenter" abstract="false" lazy="false" discriminator-value="DataCenter" table="`ops_datacenter`">
+		<meta attribute="eclassName">DataCenter</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_datacenterdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="host" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`datacenter_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Host"/>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DomainImpl" entity-name="Domain" abstract="false" lazy="false" discriminator-value="Domain" table="`domain`">
+		<meta attribute="eclassName">Domain</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="domaindtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="systems" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`domain_system`">
+			<key update="true">
+				<column name="`domain_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="DomainSystem" unique="false" foreign-key="domain_systems">
+				<column name="`domainsystem_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DomainSystemImpl" entity-name="DomainSystem" abstract="false" lazy="false" discriminator-value="DomainSystem" table="`domainsystem`">
+		<meta attribute="eclassName">DomainSystem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="domainsystemdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<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>
+		<bag name="domains" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`domain_system`">
+			<key update="true">
+				<column name="`system_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Domain" unique="false" foreign-key="domainsystem_domains">
+				<column name="`domain_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="opsSystem" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_domainsystem_opssystem`">
+			<key update="true">
+				<column name="`domainsystem_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="OpsSystem" unique="false" foreign-key="domainsystem_opssystem">
+				<column name="`system_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<many-to-one name="interface" entity-name="Interface" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="domainsystem_interface" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`interface_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="forwardEmail" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`forwardemail`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.FailoverTypeImpl" entity-name="FailoverType" abstract="false" lazy="false" discriminator-value="FailoverType" table="`ops_failovertype`">
+		<meta attribute="eclassName">FailoverType</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_failovertypedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.HostImpl" entity-name="Host" abstract="false" lazy="false" discriminator-value="Host" table="`ops_host`">
+		<meta attribute="eclassName">Host</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_hostdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="dataCenter" entity-name="DataCenter" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="host_datacenter" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_datacenter_id`"/>
+		</many-to-one>
+		<bag name="vserver" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`host_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<bag name="ip" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`host_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="IP"/>
+		</bag>
+		<many-to-one name="ownIp" entity-name="IP" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="host_ownip" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ownip_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`description`" length="64000"/>
+		</property>
+		<property name="network" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`network`" length="64000"/>
+		</property>
+		<property name="providerId" lazy="false" insert="true" update="true" not-null="false" unique="true" type="text">
+			<column not-null="false" unique="true" name="`providerid`" length="64000"/>
+		</property>
+		<many-to-one name="gateway" entity-name="IP" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="host_gateway" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`ip_gateway_id`"/>
+		</many-to-one>
+		<bag name="block" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`host_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="HostBlock"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.HostBlockImpl" entity-name="HostBlock" abstract="false" lazy="false" discriminator-value="HostBlock" table="`ops_hostblock`">
+		<meta attribute="eclassName">HostBlock</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_hostblockdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<many-to-one name="host" entity-name="Host" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="hostblock_host" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_id`"/>
+		</many-to-one>
+		<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="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="agent" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`agent`"/>
+		</property>
+		<property name="service" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`service`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.InterfaceImpl" entity-name="Interface" abstract="false" lazy="false" discriminator-value="Interface" table="`ops_interface`">
+		<meta attribute="eclassName">Interface</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_interfacedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="role" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_role_interface`">
+			<key update="true">
+				<column name="`interface_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Role" unique="false" foreign-key="interface_role">
+				<column name="`role_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="domainSystem" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`interface_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="DomainSystem"/>
+		</bag>
+		<many-to-one name="failoverType" entity-name="FailoverType" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="interface_failovertype" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`failovertype_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="port" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`port`"/>
+		</property>
+		<property name="external" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`external`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.IPImpl" entity-name="IP" abstract="false" lazy="false" discriminator-value="IP" table="`ops_ip`">
+		<meta attribute="eclassName">IP</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_ipdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="ip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ip`"/>
+		</property>
+		<many-to-one name="host" entity-name="Host" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ip_host" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_id`"/>
+		</many-to-one>
+		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`type`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.IpType</param>
+				<param name="eclassifier">IpType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</param>
+			</type>
+		</property>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="shared" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`shared`"/>
+		</property>
+		<bag name="ipName" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_ip_ipname`">
+			<key update="true">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="IPName" unique="false" foreign-key="ip_ipname">
+				<column name="`ipname_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="vserver" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_vserver_ip`">
+			<key update="true">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="VServer" unique="false" foreign-key="ip_vserver">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.MuninInfoImpl" entity-name="MuninInfo" abstract="false" lazy="false" discriminator-value="MuninInfo" table="`ops_munininfo`">
+		<meta attribute="eclassName">MuninInfo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_munininfodtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<property name="pluginName" lazy="false" insert="true" update="true" not-null="false" unique="true" type="text">
+			<column not-null="false" unique="true" name="`pluginname`" length="64000"/>
+		</property>
+		<property name="warningLevel" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`warninglevel`"/>
+		</property>
+		<property name="criticalLevel" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`criticallevel`"/>
+		</property>
+		<property name="monitorableByNagios" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`monitorablebynagios`"/>
+		</property>
+		<property name="displaySummary" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
+			<column not-null="false" unique="false" name="`displaysummary`"/>
+		</property>
+		<many-to-one name="role" entity-name="Role" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="munininfo_role" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`role_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.IPNameImpl" entity-name="IPName" abstract="false" lazy="false" discriminator-value="IPName" table="`ops_ipname`">
+		<meta attribute="eclassName">IPName</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_ipnamedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</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>
+		<bag name="ip" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_ip_ipname`">
+			<key update="true">
+				<column name="`ipname_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="IP" unique="false" foreign-key="ipname_ip">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.ParameterImpl" entity-name="Parameter" abstract="false" lazy="false" discriminator-value="Parameter" table="`ops_parameter`">
+		<meta attribute="eclassName">Parameter</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_parameterdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<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>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.RoleImpl" entity-name="Role" abstract="false" lazy="false" discriminator-value="Role" table="`ops_role`">
+		<meta attribute="eclassName">Role</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_roledtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="interface" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_role_interface`">
+			<key update="true">
+				<column name="`role_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Interface" unique="false" foreign-key="role_interface">
+				<column name="`interface_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="vserver" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`role_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<bag name="requiredInterface" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_role_requredinterface`">
+			<key update="true">
+				<column name="`role_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Interface" unique="false" foreign-key="role_requiredinterface"/>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+		<bag name="muninInfo" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`role_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="MuninInfo"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.OpsSystemImpl" entity-name="OpsSystem" abstract="false" lazy="false" discriminator-value="OpsSystem" table="`ops_opssystem`">
+		<meta attribute="eclassName">OpsSystem</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_opssystemdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="ownVserver" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`own_opssystem_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="VServer"/>
+		</bag>
+		<bag name="servingVserver" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_vserver_opssystem`">
+			<key update="true">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="VServer" unique="false" foreign-key="opssystem_servingvserver">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="domainSystem" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`ops_domainsystem_opssystem`">
+			<key update="true">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="DomainSystem" unique="false" foreign-key="opssystem_domainsystem">
+				<column name="`domainsystem_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.VServerImpl" entity-name="VServer" abstract="false" lazy="false" discriminator-value="VServer" table="`ops_vserver`">
+		<meta attribute="eclassName">VServer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ops_vserverdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="revision" type="int">
+			<column not-null="false" unique="false" name="`e_version`"/>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="block" fetch="select" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`vserver_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Block"/>
+		</bag>
+		<many-to-one name="ownSystem" entity-name="OpsSystem" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vserver_ownsystem" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`own_opssystem_id`"/>
+		</many-to-one>
+		<bag name="servedSystem" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_vserver_opssystem`">
+			<key update="true">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="OpsSystem" unique="false" foreign-key="vserver_servedsystem">
+				<column name="`opssystem_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="ip" fetch="select" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`ops_vserver_ip`">
+			<key update="true">
+				<column name="`vserver_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="IP" unique="false" foreign-key="vserver_ip">
+				<column name="`ip_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<many-to-one name="host" entity-name="Host" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vserver_host" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`host_id`"/>
+		</many-to-one>
+		<many-to-one name="role" entity-name="Role" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="vserver_role" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`role_id`"/>
+		</many-to-one>
+		<property name="modified" lazy="false" insert="false" update="false" not-null="false" unique="false" generated="always" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`" sql-type="timestamp"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DWHClusterImpl" entity-name="DWHCluster" abstract="false" lazy="false" discriminator-value="DWHCluster" table="`dwhcluster`">
+		<meta attribute="eclassName">DWHCluster</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</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 type="string">
+			<column name="dtype" index="dwhclusterdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="instance" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="dwhcluster_instance">
+				<column name="`dwhcluster_instance_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`dwhcluster_instance_idx`"/>
+			<one-to-many entity-name="DWHInstance"/>
+		</list>
+		<property name="id" lazy="false" insert="true" update="true" not-null="true" unique="false" type="long">
+			<column not-null="true" unique="false" name="`id`"/>
+		</property>
+		<property name="modified" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`"/>
+		</property>
+		<property name="revision" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`revision`"/>
+		</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>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz225296_2.ops.impl.DWHInstanceImpl" entity-name="DWHInstance" abstract="false" lazy="false" discriminator-value="DWHInstance" table="`dwhinstance`">
+		<meta attribute="eclassName">DWHInstance</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296_2</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 type="string">
+			<column name="dtype" index="dwhinstancedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="id" lazy="false" insert="true" update="true" not-null="true" unique="false" type="long">
+			<column not-null="true" unique="false" name="`id`"/>
+		</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="etl" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="dwhinstance_etl">
+				<column name="`dwhinstance_etl_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`dwhinstance_etl_idx`"/>
+			<one-to-many entity-name="VServer"/>
+		</list>
+		<property name="modified" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+			<column not-null="false" unique="false" name="`modified`"/>
+		</property>
+		<property name="revision" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`revision`"/>
+		</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>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..3b98bfbe4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,52 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237361.impl.OneImpl" entity-name="One" abstract="false" lazy="false" discriminator-value="One" table="`one`">
+		<meta attribute="eclassName">One</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz237361</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 type="string">
+			<column name="dtype" index="onedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<bag name="manies" inverse="true" table="`maniesofone`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`one_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Many" unique="true">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237361.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" discriminator-value="Many" table="`many`">
+		<meta attribute="eclassName">Many</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz237361</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 type="string">
+			<column name="dtype" index="manydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myname`"/>
+		</property>
+		<join table="maniesofone" inverse="false" optional="true">
+			<key update="true">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-one name="one" entity-name="One" lazy="false" insert="true" update="true" cascade="merge,persist,save-update,lock,refresh" foreign-key="many_one">
+				<column not-null="false" unique="false" name="`one_e_id`"/>
+			</many-to-one>
+		</join>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a7efcbcef
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,46 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237361.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
+		<meta attribute="eclassName" inherit="false">One</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz237361</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<bag name="manies" inverse="true" table="`maniesofone`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`one_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Many" unique="true">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237361.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
+		<meta attribute="eclassName" inherit="false">Many</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz237361</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myname`"/>
+		</property>
+		<join table="`maniesofone`" inverse="false" optional="true">
+			<key update="true">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-one name="one" entity-name="One" lazy="false" insert="true" update="true" cascade="merge,persist,save-update,lock,refresh" foreign-key="many_one">
+				<column not-null="false" unique="false" name="`one_e_id`"/>
+			</many-to-one>
+		</join>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a7efcbcef
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,46 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237361.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
+		<meta attribute="eclassName" inherit="false">One</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz237361</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<bag name="manies" inverse="true" table="`maniesofone`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`one_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Many" unique="true">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237361.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
+		<meta attribute="eclassName" inherit="false">Many</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz237361</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myname`"/>
+		</property>
+		<join table="`maniesofone`" inverse="false" optional="true">
+			<key update="true">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-one name="one" entity-name="One" lazy="false" insert="true" update="true" cascade="merge,persist,save-update,lock,refresh" foreign-key="many_one">
+				<column not-null="false" unique="false" name="`one_e_id`"/>
+			</many-to-one>
+		</join>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..be98b10de
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,42 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237498.impl.OneImpl" entity-name="One" abstract="false" lazy="false" discriminator-value="One" table="`one`">
+		<meta attribute="eclassName">One</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz237498</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 type="string">
+			<column name="dtype" index="onedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<bag name="manies" order-by="`myname` asc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="one_manies">
+				<column name="`one_manies_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Many"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237498.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" discriminator-value="Many" table="`many`">
+		<meta attribute="eclassName">Many</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz237498</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 type="string">
+			<column name="dtype" index="manydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..31fc7c147
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,36 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237498.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
+		<meta attribute="eclassName" inherit="false">One</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz237498</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<bag name="manies" order-by="`myname` asc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="one_manies">
+				<column name="`one_manies_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Many"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237498.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
+		<meta attribute="eclassName" inherit="false">Many</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz237498</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..31fc7c147
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,36 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237498.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
+		<meta attribute="eclassName" inherit="false">One</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz237498</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<bag name="manies" order-by="`myname` asc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="one_manies">
+				<column name="`one_manies_e_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Many"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237498.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
+		<meta attribute="eclassName" inherit="false">Many</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz237498</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237790Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237790Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..07299f285
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237790Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,47 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237790.impl.OneImpl" entity-name="One" abstract="false" lazy="false" discriminator-value="One" table="`one`">
+		<meta attribute="eclassName">One</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</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 type="string">
+			<column name="dtype" index="onedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<idbag name="manies" table="`one_many`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`one_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Many" unique="false" foreign-key="one_manies">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</idbag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237790.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" discriminator-value="Many" table="`many`">
+		<meta attribute="eclassName">Many</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</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 type="string">
+			<column name="dtype" index="manydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237790Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237790Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..94dff5a47
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237790Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,41 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237790.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
+		<meta attribute="eclassName" inherit="false">One</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<idbag name="manies" table="`one_many`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`one_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Many" unique="false" foreign-key="one_manies">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</idbag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237790.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
+		<meta attribute="eclassName" inherit="false">Many</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237790Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237790Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..94dff5a47
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237790Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,41 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237790.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
+		<meta attribute="eclassName" inherit="false">One</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<idbag name="manies" table="`one_many`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<collection-id column="ID" type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key update="true">
+				<column name="`one_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Many" unique="false" foreign-key="one_manies">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</idbag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237790.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
+		<meta attribute="eclassName" inherit="false">Many</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237994Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237994Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..350f42a66
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237994Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,46 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237994.impl.OneImpl" entity-name="One" abstract="false" lazy="false" discriminator-value="One" table="`one`">
+		<meta attribute="eclassName">One</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz237994</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 type="string">
+			<column name="dtype" index="onedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="manies" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`ref_to_one`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`one_manies_idx`"/>
+			<one-to-many entity-name="Many"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237994.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" discriminator-value="Many" table="`many`">
+		<meta attribute="eclassName">Many</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz237994</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 type="string">
+			<column name="dtype" index="manydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myname`"/>
+		</property>
+		<many-to-one name="one" entity-name="One" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="many_one" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`ref_to_one`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237994Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237994Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a30df4d6a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237994Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,40 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237994.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
+		<meta attribute="eclassName" inherit="false">One</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz237994</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="manies" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`ref_to_one`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`one_manies_idx`"/>
+			<one-to-many entity-name="Many"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237994.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
+		<meta attribute="eclassName" inherit="false">Many</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz237994</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myname`"/>
+		</property>
+		<many-to-one name="one" entity-name="One" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="many_one" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`ref_to_one`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237994Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237994Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a30df4d6a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237994Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,40 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237994.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
+		<meta attribute="eclassName" inherit="false">One</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz237994</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="manies" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`ref_to_one`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`one_manies_idx`"/>
+			<one-to-many entity-name="Many"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz237994.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
+		<meta attribute="eclassName" inherit="false">Many</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz237994</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`myname`"/>
+		</property>
+		<many-to-one name="one" entity-name="One" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="many_one" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`ref_to_one`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247785Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247785Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4372446f1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247785Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,49 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz247785.impl.OwnerImpl" entity-name="Owner" abstract="false" lazy="false" discriminator-value="Owner" table="`owner`">
+		<meta attribute="eclassName">Owner</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz247785</meta>
+		<id name="id" type="java.lang.Long">
+			<column not-null="true" unique="false" name="`owner_id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ownerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="ownedCats" inverse="true" lazy="true" cascade="merge,persist,save-update,lock">
+			<key update="true">
+				<column name="`cat_owner_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Cat"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz247785.bz247785Sub.impl.AnimalImpl" entity-name="Animal" abstract="false" lazy="false" discriminator-value="Animal" table="`animal`">
+		<meta attribute="eclassName">Animal</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz247785/sub</meta>
+		<id name="id" type="java.lang.Long">
+			<column not-null="true" unique="false" name="`animal_id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ANIMALdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.bz247785.bz247785Sub.impl.CatImpl" entity-name="Cat" abstract="false" lazy="false" extends="Animal" discriminator-value="Cat">
+		<meta attribute="eclassName">Cat</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz247785/sub</meta>
+		<many-to-one name="owner" entity-name="Owner" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="cat_owner" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`cat_owner_id`"/>
+		</many-to-one>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247785Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247785Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a9070aa7b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247785Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,46 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz247785.impl.OwnerImpl" entity-name="Owner" abstract="false" lazy="false" table="`owner`">
+		<meta attribute="eclassName" inherit="false">Owner</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz247785</meta>
+		<id name="id" type="java.lang.Long">
+			<column not-null="true" unique="false" name="`owner_id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="ownedCats" inverse="true" lazy="true" cascade="merge,persist,save-update,lock">
+			<key update="true">
+				<column name="`cat_owner_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Cat"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz247785.bz247785Sub.impl.AnimalImpl" entity-name="Animal" abstract="false" lazy="false" discriminator-value="Animal" table="`animal`">
+		<meta attribute="eclassName" inherit="false">Animal</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz247785/sub</meta>
+		<id name="id" type="java.lang.Long">
+			<column not-null="true" unique="false" name="`animal_id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ANIMALdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.bz247785.bz247785Sub.impl.CatImpl" entity-name="Cat" abstract="false" lazy="false" extends="Animal" discriminator-value="Cat">
+		<meta attribute="eclassName" inherit="false">Cat</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz247785/sub</meta>
+		<many-to-one name="owner" entity-name="Owner" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="cat_owner" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`cat_owner_id`"/>
+		</many-to-one>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247785Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247785Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a9070aa7b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247785Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,46 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz247785.impl.OwnerImpl" entity-name="Owner" abstract="false" lazy="false" table="`owner`">
+		<meta attribute="eclassName" inherit="false">Owner</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz247785</meta>
+		<id name="id" type="java.lang.Long">
+			<column not-null="true" unique="false" name="`owner_id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="ownedCats" inverse="true" lazy="true" cascade="merge,persist,save-update,lock">
+			<key update="true">
+				<column name="`cat_owner_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Cat"/>
+		</bag>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz247785.bz247785Sub.impl.AnimalImpl" entity-name="Animal" abstract="false" lazy="false" discriminator-value="Animal" table="`animal`">
+		<meta attribute="eclassName" inherit="false">Animal</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz247785/sub</meta>
+		<id name="id" type="java.lang.Long">
+			<column not-null="true" unique="false" name="`animal_id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="ANIMALdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.bz247785.bz247785Sub.impl.CatImpl" entity-name="Cat" abstract="false" lazy="false" extends="Animal" discriminator-value="Cat">
+		<meta attribute="eclassName" inherit="false">Cat</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz247785/sub</meta>
+		<many-to-one name="owner" entity-name="Owner" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="cat_owner" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`cat_owner_id`"/>
+		</many-to-one>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247939Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247939Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..da4f9e920
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247939Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,54 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz247939.impl.AnimalImpl" entity-name="Animal" abstract="false" lazy="false" discriminator-value="Animal" table="`animal`">
+		<meta attribute="eclassName">Animal</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz247939</meta>
+		<id name="id" type="java.lang.Long">
+			<column not-null="true" unique="false" name="`animal_id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="ANIMAL_TYPE" index="ANIMALANIMAL_TYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz247939.impl.OwnerImpl" entity-name="Owner" abstract="false" lazy="false" discriminator-value="Owner" table="`owner`">
+		<meta attribute="eclassName">Owner</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz247939</meta>
+		<id name="id" type="java.lang.Long">
+			<column not-null="true" unique="false" name="`owner_id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="OWNERdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="ownedCats" inverse="true" lazy="true" cascade="merge,persist,save-update,lock">
+			<key update="true">
+				<column name="`cat_owner_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Cat"/>
+		</bag>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.bz247939.impl.CatImpl" entity-name="Cat" abstract="false" lazy="false" extends="Animal" discriminator-value="Cat">
+		<meta attribute="eclassName">Cat</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz247939</meta>
+		<join table="`cat`">
+			<key>
+				<column name="`animal_id`"/>
+			</key>
+			<many-to-one name="owner" entity-name="Owner" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="cat_owner" insert="true" update="true" not-null="false">
+				<column not-null="false" unique="false" name="`cat_owner_id`"/>
+			</many-to-one>
+		</join>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247939Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247939Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0656e132d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247939Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,51 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz247939.impl.AnimalImpl" entity-name="Animal" abstract="false" lazy="false" discriminator-value="Animal" table="`animal`">
+		<meta attribute="eclassName" inherit="false">Animal</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz247939</meta>
+		<id name="id" type="java.lang.Long">
+			<column not-null="true" unique="false" name="`animal_id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="ANIMAL_TYPE" index="ANIMALANIMAL_TYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz247939.impl.OwnerImpl" entity-name="Owner" abstract="false" lazy="false" table="`owner`">
+		<meta attribute="eclassName" inherit="false">Owner</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz247939</meta>
+		<id name="id" type="java.lang.Long">
+			<column not-null="true" unique="false" name="`owner_id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="ownedCats" inverse="true" lazy="true" cascade="merge,persist,save-update,lock">
+			<key update="true">
+				<column name="`cat_owner_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Cat"/>
+		</bag>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.bz247939.impl.CatImpl" entity-name="Cat" abstract="false" lazy="false" extends="Animal" discriminator-value="Cat">
+		<meta attribute="eclassName" inherit="false">Cat</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz247939</meta>
+		<join table="`cat`">
+			<key>
+				<column name="`animal_id`"/>
+			</key>
+			<many-to-one name="owner" entity-name="Owner" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="cat_owner" insert="true" update="true" not-null="false">
+				<column not-null="false" unique="false" name="`cat_owner_id`"/>
+			</many-to-one>
+		</join>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247939Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247939Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..0656e132d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ247939Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,51 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz247939.impl.AnimalImpl" entity-name="Animal" abstract="false" lazy="false" discriminator-value="Animal" table="`animal`">
+		<meta attribute="eclassName" inherit="false">Animal</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz247939</meta>
+		<id name="id" type="java.lang.Long">
+			<column not-null="true" unique="false" name="`animal_id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="ANIMAL_TYPE" index="ANIMALANIMAL_TYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz247939.impl.OwnerImpl" entity-name="Owner" abstract="false" lazy="false" table="`owner`">
+		<meta attribute="eclassName" inherit="false">Owner</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz247939</meta>
+		<id name="id" type="java.lang.Long">
+			<column not-null="true" unique="false" name="`owner_id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<bag name="ownedCats" inverse="true" lazy="true" cascade="merge,persist,save-update,lock">
+			<key update="true">
+				<column name="`cat_owner_id`" not-null="false" unique="false"/>
+			</key>
+			<one-to-many entity-name="Cat"/>
+		</bag>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.bz247939.impl.CatImpl" entity-name="Cat" abstract="false" lazy="false" extends="Animal" discriminator-value="Cat">
+		<meta attribute="eclassName" inherit="false">Cat</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz247939</meta>
+		<join table="`cat`">
+			<key>
+				<column name="`animal_id`"/>
+			</key>
+			<many-to-one name="owner" entity-name="Owner" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="cat_owner" insert="true" update="true" not-null="false">
+				<column not-null="false" unique="false" name="`cat_owner_id`"/>
+			</many-to-one>
+		</join>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249246Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249246Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e3adac747
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249246Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,29 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz249246.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz249246</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 type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.bz249246.impl.StudentImpl" entity-name="Student" abstract="false" lazy="false" extends="Person" discriminator-value="Student">
+		<meta attribute="eclassName">Student</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz249246</meta>
+		<property name="id" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+			<column not-null="false" unique="true" name="`id`"/>
+		</property>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249246Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249246Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..440792483
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249246Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,29 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz249246.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz249246</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.bz249246.impl.StudentImpl" entity-name="Student" abstract="false" lazy="false" extends="Person" table="`student`">
+		<meta attribute="eclassName" inherit="false">Student</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz249246</meta>
+		<key>
+			<column name="`person_e_id`"/>
+		</key>
+		<property name="id" lazy="false" insert="true" update="true" not-null="true" unique="true" type="java.lang.String">
+			<column not-null="true" unique="true" name="`id`"/>
+		</property>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249246Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249246Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..440792483
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249246Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,29 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz249246.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz249246</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.bz249246.impl.StudentImpl" entity-name="Student" abstract="false" lazy="false" extends="Person" table="`student`">
+		<meta attribute="eclassName" inherit="false">Student</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz249246</meta>
+		<key>
+			<column name="`person_e_id`"/>
+		</key>
+		<property name="id" lazy="false" insert="true" update="true" not-null="true" unique="true" type="java.lang.String">
+			<column not-null="true" unique="true" name="`id`"/>
+		</property>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..918544d81
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,94 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`author`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`author`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b96290afe
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`author`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`author`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b96290afe
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,85 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`author`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`author`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ253799Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ253799Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..9e03a02f7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ253799Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,39 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz253799.impl.OneImpl" entity-name="One" abstract="false" lazy="false" discriminator-value="One" table="`one`">
+		<meta attribute="eclassName">One</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz253799</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 type="string">
+			<column name="dtype" index="onedtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="ref" entity-name="Two" cascade="merge,persist,save-update,lock,refresh" not-null="true" lazy="false" foreign-key="one_ref" insert="true" update="true" unique="true">
+			<column not-null="true" unique="false" name="`ref1`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz253799.impl.TwoImpl" entity-name="Two" abstract="false" lazy="false" discriminator-value="Two" table="`two`">
+		<meta attribute="eclassName">Two</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz253799</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 type="string">
+			<column name="dtype" index="twodtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="ref" entity-name="One" cascade="merge,persist,save-update,lock,refresh" not-null="true" lazy="false" foreign-key="two_ref" insert="true" update="true" unique="true">
+			<column not-null="true" unique="false" name="`ref1`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ253799Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ253799Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1ce6fe2fc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ253799Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,33 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz253799.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
+		<meta attribute="eclassName" inherit="false">One</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz253799</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="ref" entity-name="Two" cascade="merge,persist,save-update,lock,refresh" not-null="true" lazy="false" foreign-key="one_ref" insert="true" update="true" unique="true">
+			<column not-null="true" unique="false" name="`ref1`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz253799.impl.TwoImpl" entity-name="Two" abstract="false" lazy="false" table="`two`">
+		<meta attribute="eclassName" inherit="false">Two</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz253799</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="ref" entity-name="One" cascade="merge,persist,save-update,lock,refresh" not-null="true" lazy="false" foreign-key="two_ref" insert="true" update="true" unique="true">
+			<column not-null="true" unique="false" name="`ref1`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ253799Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ253799Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1ce6fe2fc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ253799Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,33 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz253799.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
+		<meta attribute="eclassName" inherit="false">One</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz253799</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="ref" entity-name="Two" cascade="merge,persist,save-update,lock,refresh" not-null="true" lazy="false" foreign-key="one_ref" insert="true" update="true" unique="true">
+			<column not-null="true" unique="false" name="`ref1`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz253799.impl.TwoImpl" entity-name="Two" abstract="false" lazy="false" table="`two`">
+		<meta attribute="eclassName" inherit="false">Two</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz253799</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<many-to-one name="ref" entity-name="One" cascade="merge,persist,save-update,lock,refresh" not-null="true" lazy="false" foreign-key="two_ref" insert="true" update="true" unique="true">
+			<column not-null="true" unique="false" name="`ref1`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277546Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277546Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fc4f00b40
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277546Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,47 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz277546.impl.AnotherVersionImpl" entity-name="AnotherVersion" abstract="false" lazy="false" discriminator-value="AnotherVersion" table="`anotherversion`">
+		<meta attribute="eclassName">AnotherVersion</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz277546</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="anotherversiondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="version" type="timestamp">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz277546.impl.DateVersionImpl" entity-name="DateVersion" abstract="false" lazy="false" discriminator-value="DateVersion" table="`dateversion`">
+		<meta attribute="eclassName">DateVersion</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz277546</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="dateversiondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="version" type="java.util.Date">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz277546.impl.SimpleVersionImpl" entity-name="SimpleVersion" abstract="false" lazy="false" discriminator-value="SimpleVersion" table="`simpleversion`">
+		<meta attribute="eclassName">SimpleVersion</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz277546</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="simpleversiondtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="version" type="timestamp">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277546Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277546Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..237229469
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277546Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz277546.impl.AnotherVersionImpl" entity-name="AnotherVersion" abstract="false" lazy="false" table="`anotherversion`">
+		<meta attribute="eclassName" inherit="false">AnotherVersion</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz277546</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="version" type="timestamp">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz277546.impl.DateVersionImpl" entity-name="DateVersion" abstract="false" lazy="false" table="`dateversion`">
+		<meta attribute="eclassName" inherit="false">DateVersion</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz277546</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="version" type="java.util.Date">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz277546.impl.SimpleVersionImpl" entity-name="SimpleVersion" abstract="false" lazy="false" table="`simpleversion`">
+		<meta attribute="eclassName" inherit="false">SimpleVersion</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz277546</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="version" type="timestamp">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277546Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277546Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..237229469
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277546Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz277546.impl.AnotherVersionImpl" entity-name="AnotherVersion" abstract="false" lazy="false" table="`anotherversion`">
+		<meta attribute="eclassName" inherit="false">AnotherVersion</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz277546</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="version" type="timestamp">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz277546.impl.DateVersionImpl" entity-name="DateVersion" abstract="false" lazy="false" table="`dateversion`">
+		<meta attribute="eclassName" inherit="false">DateVersion</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz277546</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="version" type="java.util.Date">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.bz277546.impl.SimpleVersionImpl" entity-name="SimpleVersion" abstract="false" lazy="false" table="`simpleversion`">
+		<meta attribute="eclassName" inherit="false">SimpleVersion</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz277546</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="version" type="timestamp">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277570Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277570Action_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e02c1c5d8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277570Action_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,53 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.adept.impl.BazImpl" entity-name="Baz" abstract="true" lazy="false" discriminator-value="Baz" table="`baz`">
+		<meta attribute="eclassName">Baz</meta>
+		<meta attribute="epackage">org.eclipse.emf.teneo.samples.issues.bz277570</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="bazdtype" length="255" not-null="true"/>
+		</discriminator>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.adept.impl.FooImpl" entity-name="Foo" abstract="false" lazy="false" discriminator-value="Foo" table="`foo`">
+		<meta attribute="eclassName">Foo</meta>
+		<meta attribute="epackage">org.eclipse.emf.teneo.samples.issues.bz277570</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="foodtype" length="255" not-null="true"/>
+		</discriminator>
+		<list name="bars" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="foo_bars">
+				<column name="`foo_bars_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`foo_bars_idx`"/>
+			<one-to-many entity-name="Bar"/>
+		</list>
+		<list name="biffs" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="foo_biffs">
+				<column name="`foo_biffs_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`foo_biffs_idx`"/>
+			<one-to-many entity-name="Biff"/>
+		</list>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.adept.impl.BarImpl" entity-name="Bar" abstract="false" lazy="false" extends="Baz" discriminator-value="Bar">
+		<meta attribute="eclassName">Bar</meta>
+		<meta attribute="epackage">org.eclipse.emf.teneo.samples.issues.bz277570</meta>
+		<many-to-one name="baz" entity-name="Baz" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="bar_baz" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`baz_baz_id`"/>
+		</many-to-one>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.adept.impl.BiffImpl" entity-name="Biff" abstract="false" lazy="false" extends="Baz" discriminator-value="Biff">
+		<meta attribute="eclassName">Biff</meta>
+		<meta attribute="epackage">org.eclipse.emf.teneo.samples.issues.bz277570</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277570Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277570Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..340138226
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277570Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,53 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.adept.impl.BazImpl" entity-name="Baz" abstract="true" lazy="false" table="`baz`">
+		<meta attribute="eclassName" inherit="false">Baz</meta>
+		<meta attribute="epackage" inherit="false">org.eclipse.emf.teneo.samples.issues.bz277570</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.adept.impl.FooImpl" entity-name="Foo" abstract="false" lazy="false" table="`foo`">
+		<meta attribute="eclassName" inherit="false">Foo</meta>
+		<meta attribute="epackage" inherit="false">org.eclipse.emf.teneo.samples.issues.bz277570</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<list name="bars" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="foo_bars">
+				<column name="`foo_bars_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`foo_bars_idx`"/>
+			<one-to-many entity-name="Bar"/>
+		</list>
+		<list name="biffs" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="foo_biffs">
+				<column name="`foo_biffs_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`foo_biffs_idx`"/>
+			<one-to-many entity-name="Biff"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.adept.impl.BarImpl" entity-name="Bar" abstract="false" lazy="false" extends="Baz" table="`bar`">
+		<meta attribute="eclassName" inherit="false">Bar</meta>
+		<meta attribute="epackage" inherit="false">org.eclipse.emf.teneo.samples.issues.bz277570</meta>
+		<key>
+			<column name="`baz_id`"/>
+		</key>
+		<many-to-one name="baz" entity-name="Baz" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="bar_baz" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`baz_baz_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.adept.impl.BiffImpl" entity-name="Biff" abstract="false" lazy="false" extends="Baz" table="`biff`">
+		<meta attribute="eclassName" inherit="false">Biff</meta>
+		<meta attribute="epackage" inherit="false">org.eclipse.emf.teneo.samples.issues.bz277570</meta>
+		<key>
+			<column name="`baz_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277570Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277570Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..340138226
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ277570Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,53 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.adept.impl.BazImpl" entity-name="Baz" abstract="true" lazy="false" table="`baz`">
+		<meta attribute="eclassName" inherit="false">Baz</meta>
+		<meta attribute="epackage" inherit="false">org.eclipse.emf.teneo.samples.issues.bz277570</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.adept.impl.FooImpl" entity-name="Foo" abstract="false" lazy="false" table="`foo`">
+		<meta attribute="eclassName" inherit="false">Foo</meta>
+		<meta attribute="epackage" inherit="false">org.eclipse.emf.teneo.samples.issues.bz277570</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+		</id>
+		<list name="bars" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="foo_bars">
+				<column name="`foo_bars_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`foo_bars_idx`"/>
+			<one-to-many entity-name="Bar"/>
+		</list>
+		<list name="biffs" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="foo_biffs">
+				<column name="`foo_biffs_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`foo_biffs_idx`"/>
+			<one-to-many entity-name="Biff"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.adept.impl.BarImpl" entity-name="Bar" abstract="false" lazy="false" extends="Baz" table="`bar`">
+		<meta attribute="eclassName" inherit="false">Bar</meta>
+		<meta attribute="epackage" inherit="false">org.eclipse.emf.teneo.samples.issues.bz277570</meta>
+		<key>
+			<column name="`baz_id`"/>
+		</key>
+		<many-to-one name="baz" entity-name="Baz" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="bar_baz" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`baz_baz_id`"/>
+		</many-to-one>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.adept.impl.BiffImpl" entity-name="Biff" abstract="false" lazy="false" extends="Baz" table="`biff`">
+		<meta attribute="eclassName" inherit="false">Biff</meta>
+		<meta attribute="epackage" inherit="false">org.eclipse.emf.teneo.samples.issues.bz277570</meta>
+		<key>
+			<column name="`baz_id`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ302933Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ302933Action_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ed3231696
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ302933Action_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,16 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz302933.bz302933_1.impl.TestTypeImpl" entity-name="TestType" abstract="false" lazy="false" table="`testtype`">
+		<meta attribute="eclassName" inherit="false">TestType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz302933/subpackage1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ302933Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ302933Action_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ed3231696
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ302933Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,16 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bz302933.bz302933_1.impl.TestTypeImpl" entity-name="TestType" abstract="false" lazy="false" table="`testtype`">
+		<meta attribute="eclassName" inherit="false">TestType</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bz302933/subpackage1</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BagDuplicateAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BagDuplicateAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..7ce1f8797
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BagDuplicateAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,32 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bagduplicate.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bagduplicate</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="father" entity-name="Person" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_father" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`person_father_name`"/>
+		</many-to-one>
+		<many-to-one name="mother" entity-name="Person" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_mother" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`person_mother_name`"/>
+		</many-to-one>
+		<bag name="children" table="`person_person`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`person_children_name`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Person" unique="false" foreign-key="person_children">
+				<column name="`person_name`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BagDuplicateAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BagDuplicateAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..13c967723
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BagDuplicateAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,29 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bagduplicate.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bagduplicate</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<many-to-one name="father" entity-name="Person" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_father" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`person_father_name`"/>
+		</many-to-one>
+		<many-to-one name="mother" entity-name="Person" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_mother" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`person_mother_name`"/>
+		</many-to-one>
+		<bag name="children" table="`person_person`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`person_children_name`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Person" unique="false" foreign-key="person_children">
+				<column name="`person_name`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BagDuplicateAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BagDuplicateAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..13c967723
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BagDuplicateAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,29 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.bagduplicate.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/bagduplicate</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<many-to-one name="father" entity-name="Person" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_father" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`person_father_name`"/>
+		</many-to-one>
+		<many-to-one name="mother" entity-name="Person" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_mother" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`person_mother_name`"/>
+		</many-to-one>
+		<bag name="children" table="`person_person`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`person_children_name`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Person" unique="false" foreign-key="person_children">
+				<column name="`person_name`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/EnumTestAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/EnumTestAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..f8f3c5850
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/EnumTestAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,33 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="enumtest.ItemTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/enumtest</param>
+		<param name="edatatype">ItemTypeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.issues.enumtest.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/enumtest</meta>
+		<id name="itemType">
+			<column not-null="true" unique="false" name="`itemtype`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.enumtest.ItemType</param>
+			</type>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="itemdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="nullableItemType" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`nullableitemtype`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.enumtest.ItemType</param>
+				<param name="eclassifier">ItemType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/enumtest</param>
+			</type>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/EnumTestAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/EnumTestAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6b8f800e1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/EnumTestAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,30 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="enumtest.ItemTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/enumtest</param>
+		<param name="edatatype">ItemTypeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.issues.enumtest.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
+		<meta attribute="eclassName" inherit="false">Item</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/enumtest</meta>
+		<id name="itemType">
+			<column not-null="true" unique="false" name="`itemtype`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.enumtest.ItemType</param>
+			</type>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="nullableItemType" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`nullableitemtype`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.enumtest.ItemType</param>
+				<param name="eclassifier">ItemType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/enumtest</param>
+			</type>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/EnumTestAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/EnumTestAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6b8f800e1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/EnumTestAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,30 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="enumtest.ItemTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/enumtest</param>
+		<param name="edatatype">ItemTypeObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.issues.enumtest.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
+		<meta attribute="eclassName" inherit="false">Item</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/enumtest</meta>
+		<id name="itemType">
+			<column not-null="true" unique="false" name="`itemtype`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.enumtest.ItemType</param>
+			</type>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="nullableItemType" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`nullableitemtype`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.enumtest.ItemType</param>
+				<param name="eclassifier">ItemType</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/enumtest</param>
+			</type>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/GeneralTestAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/GeneralTestAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..5062e0476
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/GeneralTestAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,112 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.generaltest.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/generaltest</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 type="string">
+			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="contacts" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`contact_address_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`address_contacts_idx`"/>
+			<one-to-many entity-name="Contact"/>
+		</list>
+		<many-to-one name="country" entity-name="Country" lazy="false" foreign-key="address_country" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`country_country_e_id`"/>
+		</many-to-one>
+		<many-to-one name="city" entity-name="City" lazy="false" cascade="all" foreign-key="address_city" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`city_city_e_id`"/>
+		</many-to-one>
+		<property name="volatileString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`volatilestring`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.generaltest.impl.ContactImpl" entity-name="Contact" abstract="false" lazy="false" discriminator-value="Contact" table="`contact`">
+		<meta attribute="eclassName">Contact</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/generaltest</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 type="string">
+			<column name="dtype" index="contactdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" foreign-key="contact_address" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`contact_address_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.generaltest.impl.CountryImpl" entity-name="Country" abstract="false" lazy="false" discriminator-value="Country" table="`country`">
+		<meta attribute="eclassName">Country</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/generaltest</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 type="string">
+			<column name="dtype" index="countrydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.generaltest.impl.CityImpl" entity-name="City" abstract="false" lazy="false" discriminator-value="City" table="`city`">
+		<meta attribute="eclassName">City</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/generaltest</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 type="string">
+			<column name="dtype" index="citydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.generaltest.impl.TCImpl" entity-name="TC" abstract="false" lazy="false" discriminator-value="TC" table="`tc`">
+		<meta attribute="eclassName">TC</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/generaltest</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 type="string">
+			<column name="dtype" index="tcdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" foreign-key="tc_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`tc_address_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/GeneralTestAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/GeneralTestAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b3b5918c4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/GeneralTestAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,97 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.generaltest.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
+		<meta attribute="eclassName" inherit="false">Address</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/generaltest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="contacts" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`contact_address_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`address_contacts_idx`"/>
+			<one-to-many entity-name="Contact"/>
+		</list>
+		<many-to-one name="country" entity-name="Country" lazy="false" foreign-key="address_country" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`country_country_e_id`"/>
+		</many-to-one>
+		<many-to-one name="city" entity-name="City" lazy="false" cascade="all" foreign-key="address_city" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`city_city_e_id`"/>
+		</many-to-one>
+		<property name="volatileString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`volatilestring`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.generaltest.impl.ContactImpl" entity-name="Contact" abstract="false" lazy="false" table="`contact`">
+		<meta attribute="eclassName" inherit="false">Contact</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/generaltest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" foreign-key="contact_address" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`contact_address_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.generaltest.impl.CountryImpl" entity-name="Country" abstract="false" lazy="false" table="`country`">
+		<meta attribute="eclassName" inherit="false">Country</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/generaltest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.generaltest.impl.CityImpl" entity-name="City" abstract="false" lazy="false" table="`city`">
+		<meta attribute="eclassName" inherit="false">City</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/generaltest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.generaltest.impl.TCImpl" entity-name="TC" abstract="false" lazy="false" table="`tc`">
+		<meta attribute="eclassName" inherit="false">TC</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/generaltest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" foreign-key="tc_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`tc_address_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/GeneralTestAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/GeneralTestAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b3b5918c4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/GeneralTestAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,97 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.generaltest.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
+		<meta attribute="eclassName" inherit="false">Address</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/generaltest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="contacts" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`contact_address_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`address_contacts_idx`"/>
+			<one-to-many entity-name="Contact"/>
+		</list>
+		<many-to-one name="country" entity-name="Country" lazy="false" foreign-key="address_country" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`country_country_e_id`"/>
+		</many-to-one>
+		<many-to-one name="city" entity-name="City" lazy="false" cascade="all" foreign-key="address_city" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`city_city_e_id`"/>
+		</many-to-one>
+		<property name="volatileString" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`volatilestring`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.generaltest.impl.ContactImpl" entity-name="Contact" abstract="false" lazy="false" table="`contact`">
+		<meta attribute="eclassName" inherit="false">Contact</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/generaltest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" foreign-key="contact_address" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`contact_address_e_id`"/>
+		</many-to-one>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.generaltest.impl.CountryImpl" entity-name="Country" abstract="false" lazy="false" table="`country`">
+		<meta attribute="eclassName" inherit="false">Country</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/generaltest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.generaltest.impl.CityImpl" entity-name="City" abstract="false" lazy="false" table="`city`">
+		<meta attribute="eclassName" inherit="false">City</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/generaltest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.generaltest.impl.TCImpl" entity-name="TC" abstract="false" lazy="false" table="`tc`">
+		<meta attribute="eclassName" inherit="false">TC</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/generaltest</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="address" entity-name="Address" lazy="false" foreign-key="tc_address" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`tc_address_e_id`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InheritanceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InheritanceAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..1560fb5e6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InheritanceAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,54 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.ThingImpl" entity-name="Thing" abstract="false" lazy="false" discriminator-value="Thing" table="`thing`">
+		<meta attribute="eclassName">Thing</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="thingdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="things" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="thing_things">
+				<column name="`thing_things_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`thing_things_idx`"/>
+			<one-to-many entity-name="SubThing"/>
+		</list>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.AnnotationImpl" entity-name="Annotation" abstract="false" lazy="false" extends="Thing" discriminator-value="Annotation">
+		<meta attribute="eclassName">Annotation</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.InterestImpl" entity-name="Interest" abstract="false" lazy="false" extends="Thing" discriminator-value="Interest">
+		<meta attribute="eclassName">Interest</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.SubOneImpl" entity-name="SubOne" abstract="false" lazy="false" extends="Annotation" discriminator-value="SubOne">
+		<meta attribute="eclassName">SubOne</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.SubThingImpl" entity-name="SubThing" abstract="false" lazy="false" discriminator-value="SubThing" table="`subthing`">
+		<meta attribute="eclassName">SubThing</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="subthingdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.SubTwoImpl" entity-name="SubTwo" abstract="false" lazy="false" extends="Annotation" discriminator-value="SubTwo">
+		<meta attribute="eclassName">SubTwo</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InheritanceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InheritanceAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b82a0f57b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InheritanceAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,60 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.ThingImpl" entity-name="Thing" abstract="false" lazy="false" table="`thing`">
+		<meta attribute="eclassName" inherit="false">Thing</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="things" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="thing_things">
+				<column name="`thing_things_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`thing_things_idx`"/>
+			<one-to-many entity-name="SubThing"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.AnnotationImpl" entity-name="Annotation" abstract="false" lazy="false" extends="Thing" table="`annotation`">
+		<meta attribute="eclassName" inherit="false">Annotation</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+		<key>
+			<column name="`thing_name`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.InterestImpl" entity-name="Interest" abstract="false" lazy="false" extends="Thing" table="`interest`">
+		<meta attribute="eclassName" inherit="false">Interest</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+		<key>
+			<column name="`thing_name`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.SubOneImpl" entity-name="SubOne" abstract="false" lazy="false" extends="Annotation" table="`subone`">
+		<meta attribute="eclassName" inherit="false">SubOne</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+		<key>
+			<column name="`annotation_name`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.SubThingImpl" entity-name="SubThing" abstract="false" lazy="false" table="`subthing`">
+		<meta attribute="eclassName" inherit="false">SubThing</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.SubTwoImpl" entity-name="SubTwo" abstract="false" lazy="false" extends="Annotation" table="`subtwo`">
+		<meta attribute="eclassName" inherit="false">SubTwo</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+		<key>
+			<column name="`annotation_name`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InheritanceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InheritanceAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..b82a0f57b
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InheritanceAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,60 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.ThingImpl" entity-name="Thing" abstract="false" lazy="false" table="`thing`">
+		<meta attribute="eclassName" inherit="false">Thing</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<list name="things" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="thing_things">
+				<column name="`thing_things_name`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`thing_things_idx`"/>
+			<one-to-many entity-name="SubThing"/>
+		</list>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.AnnotationImpl" entity-name="Annotation" abstract="false" lazy="false" extends="Thing" table="`annotation`">
+		<meta attribute="eclassName" inherit="false">Annotation</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+		<key>
+			<column name="`thing_name`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.InterestImpl" entity-name="Interest" abstract="false" lazy="false" extends="Thing" table="`interest`">
+		<meta attribute="eclassName" inherit="false">Interest</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+		<key>
+			<column name="`thing_name`"/>
+		</key>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.SubOneImpl" entity-name="SubOne" abstract="false" lazy="false" extends="Annotation" table="`subone`">
+		<meta attribute="eclassName" inherit="false">SubOne</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+		<key>
+			<column name="`annotation_name`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.SubThingImpl" entity-name="SubThing" abstract="false" lazy="false" table="`subthing`">
+		<meta attribute="eclassName" inherit="false">SubThing</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.inheritance.impl.SubTwoImpl" entity-name="SubTwo" abstract="false" lazy="false" extends="Annotation" table="`subtwo`">
+		<meta attribute="eclassName" inherit="false">SubTwo</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta>
+		<key>
+			<column name="`annotation_name`"/>
+		</key>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InterfaceTrueAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InterfaceTrueAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..aeceebd63
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InterfaceTrueAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,50 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.interfacetrue.Address" entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`">
+		<meta attribute="eclassName">Address</meta>
+		<meta attribute="epackage">http:///org/elver/store/test/issues/interfacetrue.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 type="string">
+			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.interfacetrue.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress">
+		<meta attribute="eclassName">USAddress</meta>
+		<meta attribute="epackage">http:///org/elver/store/test/issues/interfacetrue.ecore</meta>
+		<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`state`"/>
+		</property>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.issues.interfacetrue.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" discriminator-value="AddressList" table="`addresslist`">
+		<meta attribute="eclassName">AddressList</meta>
+		<meta attribute="epackage">http:///org/elver/store/test/issues/interfacetrue.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 type="string">
+			<column name="dtype" index="addresslistdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<list name="addresses" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="addresslist_addresses">
+				<column name="`addresslist_addresses_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`addresslist_addresses_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InterfaceTrueAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InterfaceTrueAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fc58520b8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InterfaceTrueAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,47 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.interfacetrue.Address" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName" inherit="false">Address</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/issues/interfacetrue.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.interfacetrue.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`">
+		<meta attribute="eclassName" inherit="false">USAddress</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/issues/interfacetrue.ecore</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="state" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`state`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.issues.interfacetrue.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" table="`addresslist`">
+		<meta attribute="eclassName" inherit="false">AddressList</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/issues/interfacetrue.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="addresses" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="addresslist_addresses">
+				<column name="`addresslist_addresses_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`addresslist_addresses_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InterfaceTrueAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InterfaceTrueAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..fc58520b8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/InterfaceTrueAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,47 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.interfacetrue.Address" entity-name="Address" abstract="true" lazy="false" table="`address`">
+		<meta attribute="eclassName" inherit="false">Address</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/issues/interfacetrue.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.interfacetrue.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`">
+		<meta attribute="eclassName" inherit="false">USAddress</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/issues/interfacetrue.ecore</meta>
+		<key>
+			<column name="`address_e_id`"/>
+		</key>
+		<property name="state" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`state`"/>
+		</property>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.issues.interfacetrue.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" table="`addresslist`">
+		<meta attribute="eclassName" inherit="false">AddressList</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/store/test/issues/interfacetrue.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<list name="addresses" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true" foreign-key="addresslist_addresses">
+				<column name="`addresslist_addresses_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`addresslist_addresses_idx`"/>
+			<one-to-many entity-name="Address"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/LargeMapValueAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/LargeMapValueAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e1e463ccb
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/LargeMapValueAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,31 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.largemapvalue.impl.TestElementImpl" entity-name="TestElement" abstract="false" lazy="false" discriminator-value="TestElement" table="`testelement`">
+		<meta attribute="eclassName">TestElement</meta>
+		<meta attribute="epackage">http://www.pubcurator.org/tester/testmodel</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 type="string">
+			<column name="dtype" index="testelementdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<map name="testMap" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`testelement_testmap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="text" not-null="false" unique="false">
+				<column not-null="false" unique="false" name="`value`" length="1000000"/>
+			</element>
+		</map>
+		<property name="testProp" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`testprop`" length="1000000"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/LargeMapValueAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/LargeMapValueAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d66b48342
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/LargeMapValueAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,28 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.largemapvalue.impl.TestElementImpl" entity-name="TestElement" abstract="false" lazy="false" table="`testelement`">
+		<meta attribute="eclassName" inherit="false">TestElement</meta>
+		<meta attribute="epackage" inherit="false">http://www.pubcurator.org/tester/testmodel</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<map name="testMap" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`testelement_testmap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="text" not-null="false" unique="false">
+				<column not-null="false" unique="false" name="`value`" length="1000000"/>
+			</element>
+		</map>
+		<property name="testProp" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`testprop`" length="1000000"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/LargeMapValueAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/LargeMapValueAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..d66b48342
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/LargeMapValueAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,28 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.largemapvalue.impl.TestElementImpl" entity-name="TestElement" abstract="false" lazy="false" table="`testelement`">
+		<meta attribute="eclassName" inherit="false">TestElement</meta>
+		<meta attribute="epackage" inherit="false">http://www.pubcurator.org/tester/testmodel</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<map name="testMap" lazy="true" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`testelement_testmap_e_id`" not-null="false" unique="false"/>
+			</key>
+			<map-key type="java.lang.String"/>
+			<element type="text" not-null="false" unique="false">
+				<column not-null="false" unique="false" name="`value`" length="1000000"/>
+			</element>
+		</map>
+		<property name="testProp" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+			<column not-null="false" unique="false" name="`testprop`" length="1000000"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MTMSameAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MTMSameAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..053e643a4
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MTMSameAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.mtmsame.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`">
+		<meta attribute="eclassName">Item</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/mtmsame</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 type="string">
+			<column name="dtype" index="itemdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="mySide" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`item_item`">
+			<key update="true">
+				<column name="`item_myside_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Item" unique="false" foreign-key="item_myside">
+				<column name="`item_yourside_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="yourSide" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`item_item`">
+			<key update="true">
+				<column name="`item_yourside_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Item" unique="false" foreign-key="item_yourside">
+				<column name="`item_myside_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MTMSameAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MTMSameAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ddf808bf8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MTMSameAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,35 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.mtmsame.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
+		<meta attribute="eclassName" inherit="false">Item</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/mtmsame</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="mySide" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`item_item`">
+			<key update="true">
+				<column name="`item_myside_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Item" unique="false" foreign-key="item_myside">
+				<column name="`item_yourside_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="yourSide" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`item_item`">
+			<key update="true">
+				<column name="`item_yourside_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Item" unique="false" foreign-key="item_yourside">
+				<column name="`item_myside_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MTMSameAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MTMSameAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..ddf808bf8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MTMSameAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,35 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.mtmsame.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
+		<meta attribute="eclassName" inherit="false">Item</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/mtmsame</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<bag name="mySide" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`item_item`">
+			<key update="true">
+				<column name="`item_myside_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Item" unique="false" foreign-key="item_myside">
+				<column name="`item_yourside_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+		<bag name="yourSide" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`item_item`">
+			<key update="true">
+				<column name="`item_yourside_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Item" unique="false" foreign-key="item_yourside">
+				<column name="`item_myside_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</bag>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MultipleInheritanceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MultipleInheritanceAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8a6f390f8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MultipleInheritanceAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,121 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="testinheritance.impl.SomeBaseClassImpl" entity-name="SomeBaseClass" abstract="false" lazy="false" discriminator-value="SomeBaseClass" table="`somebaseclass`">
+		<meta attribute="eclassName">SomeBaseClass</meta>
+		<meta attribute="epackage">http://xsd.tns.example.com/testinheritance/model</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 type="string">
+			<column name="dtype" index="somebaseclassdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="anotherProperty" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`anotherproperty`"/>
+		</property>
+	</class>
+	<subclass name="testinheritance.impl.SomeResourceImpl" entity-name="SomeResource" abstract="false" lazy="false" extends="SomeBaseClass" discriminator-value="SomeResource">
+		<meta attribute="eclassName">SomeResource</meta>
+		<meta attribute="epackage">http://xsd.tns.example.com/testinheritance/model</meta>
+		<property name="property" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`property`"/>
+		</property>
+		<list name="nameValuePairs" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`someresource_namevaluepairs_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`someresource_namevaluepairs_idx`"/>
+			<one-to-many entity-name="NameValuePair"/>
+		</list>
+	</subclass>
+	<class name="testinheritance.impl.NameValuePairImpl" entity-name="NameValuePair" abstract="false" lazy="false" discriminator-value="NameValuePair" table="`namevaluepair`">
+		<meta attribute="eclassName">NameValuePair</meta>
+		<meta attribute="epackage">http://xsd.tns.example.com/testinheritance/model</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 type="string">
+			<column name="dtype" index="namevaluepairdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<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>
+	<class name="testinheritance.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" discriminator-value="ParentOne" table="`parentone`">
+		<meta attribute="eclassName">ParentOne</meta>
+		<meta attribute="epackage">http://xsd.tns.example.com/testinheritance/model</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 type="string">
+			<column name="dtype" index="parentonedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="anotherProperty" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`anotherproperty`"/>
+		</property>
+	</class>
+	<class name="testinheritance.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" discriminator-value="Child" table="`child`">
+		<meta attribute="eclassName">Child</meta>
+		<meta attribute="epackage">http://xsd.tns.example.com/testinheritance/model</meta>
+		<id name="testId" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`testid`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="childdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="someReference" entity-name="SomeReference" lazy="false" cascade="merge,persist,save-update,lock,refresh" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`somereference_somereference_name`"/>
+		</many-to-one>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+	</class>
+	<subclass name="testinheritance.impl.Child2Impl" entity-name="Child2" abstract="false" lazy="false" extends="ParentOne" discriminator-value="Child2">
+		<meta attribute="eclassName">Child2</meta>
+		<meta attribute="epackage">http://xsd.tns.example.com/testinheritance/model</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>
+		<many-to-one name="someReference" entity-name="SomeReference" lazy="false" cascade="merge,persist,save-update,lock,refresh" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`somereference_somereference_name`"/>
+		</many-to-one>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+	</subclass>
+	<class name="testinheritance.impl.SomeReferenceImpl" entity-name="SomeReference" abstract="false" lazy="false" discriminator-value="SomeReference" table="`somereference`">
+		<meta attribute="eclassName">SomeReference</meta>
+		<meta attribute="epackage">http://xsd.tns.example.com/testinheritance/model</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="somereferencedtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MultipleInheritanceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MultipleInheritanceAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..bb37ada31
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MultipleInheritanceAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,112 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="testinheritance.impl.SomeBaseClassImpl" entity-name="SomeBaseClass" abstract="false" lazy="false" table="`somebaseclass`">
+		<meta attribute="eclassName" inherit="false">SomeBaseClass</meta>
+		<meta attribute="epackage" inherit="false">http://xsd.tns.example.com/testinheritance/model</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="anotherProperty" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`anotherproperty`"/>
+		</property>
+	</class>
+	<joined-subclass name="testinheritance.impl.SomeResourceImpl" entity-name="SomeResource" abstract="false" lazy="false" extends="SomeBaseClass" table="`someresource`">
+		<meta attribute="eclassName" inherit="false">SomeResource</meta>
+		<meta attribute="epackage" inherit="false">http://xsd.tns.example.com/testinheritance/model</meta>
+		<key>
+			<column name="`somebaseclass_e_id`"/>
+		</key>
+		<property name="property" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`property`"/>
+		</property>
+		<list name="nameValuePairs" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`someresource_namevaluepairs_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`someresource_namevaluepairs_idx`"/>
+			<one-to-many entity-name="NameValuePair"/>
+		</list>
+	</joined-subclass>
+	<class name="testinheritance.impl.NameValuePairImpl" entity-name="NameValuePair" abstract="false" lazy="false" table="`namevaluepair`">
+		<meta attribute="eclassName" inherit="false">NameValuePair</meta>
+		<meta attribute="epackage" inherit="false">http://xsd.tns.example.com/testinheritance/model</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<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>
+	<class name="testinheritance.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" table="`parentone`">
+		<meta attribute="eclassName" inherit="false">ParentOne</meta>
+		<meta attribute="epackage" inherit="false">http://xsd.tns.example.com/testinheritance/model</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="anotherProperty" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`anotherproperty`"/>
+		</property>
+	</class>
+	<class name="testinheritance.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" table="`child`">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http://xsd.tns.example.com/testinheritance/model</meta>
+		<id name="testId" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`testid`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="someReference" entity-name="SomeReference" lazy="false" cascade="merge,persist,save-update,lock,refresh" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`somereference_somereference_name`"/>
+		</many-to-one>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+	</class>
+	<joined-subclass name="testinheritance.impl.Child2Impl" entity-name="Child2" abstract="false" lazy="false" extends="ParentOne" table="`child2`">
+		<meta attribute="eclassName" inherit="false">Child2</meta>
+		<meta attribute="epackage" inherit="false">http://xsd.tns.example.com/testinheritance/model</meta>
+		<key>
+			<column name="`parentzero_e_id`"/>
+		</key>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="someReference" entity-name="SomeReference" lazy="false" cascade="merge,persist,save-update,lock,refresh" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`somereference_somereference_name`"/>
+		</many-to-one>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+	</joined-subclass>
+	<class name="testinheritance.impl.SomeReferenceImpl" entity-name="SomeReference" abstract="false" lazy="false" table="`somereference`">
+		<meta attribute="eclassName" inherit="false">SomeReference</meta>
+		<meta attribute="epackage" inherit="false">http://xsd.tns.example.com/testinheritance/model</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MultipleInheritanceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MultipleInheritanceAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..bb37ada31
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/MultipleInheritanceAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,112 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="testinheritance.impl.SomeBaseClassImpl" entity-name="SomeBaseClass" abstract="false" lazy="false" table="`somebaseclass`">
+		<meta attribute="eclassName" inherit="false">SomeBaseClass</meta>
+		<meta attribute="epackage" inherit="false">http://xsd.tns.example.com/testinheritance/model</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="anotherProperty" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`anotherproperty`"/>
+		</property>
+	</class>
+	<joined-subclass name="testinheritance.impl.SomeResourceImpl" entity-name="SomeResource" abstract="false" lazy="false" extends="SomeBaseClass" table="`someresource`">
+		<meta attribute="eclassName" inherit="false">SomeResource</meta>
+		<meta attribute="epackage" inherit="false">http://xsd.tns.example.com/testinheritance/model</meta>
+		<key>
+			<column name="`somebaseclass_e_id`"/>
+		</key>
+		<property name="property" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`property`"/>
+		</property>
+		<list name="nameValuePairs" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`someresource_namevaluepairs_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`someresource_namevaluepairs_idx`"/>
+			<one-to-many entity-name="NameValuePair"/>
+		</list>
+	</joined-subclass>
+	<class name="testinheritance.impl.NameValuePairImpl" entity-name="NameValuePair" abstract="false" lazy="false" table="`namevaluepair`">
+		<meta attribute="eclassName" inherit="false">NameValuePair</meta>
+		<meta attribute="epackage" inherit="false">http://xsd.tns.example.com/testinheritance/model</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<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>
+	<class name="testinheritance.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" table="`parentone`">
+		<meta attribute="eclassName" inherit="false">ParentOne</meta>
+		<meta attribute="epackage" inherit="false">http://xsd.tns.example.com/testinheritance/model</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="anotherProperty" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`anotherproperty`"/>
+		</property>
+	</class>
+	<class name="testinheritance.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" table="`child`">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http://xsd.tns.example.com/testinheritance/model</meta>
+		<id name="testId" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`testid`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="someReference" entity-name="SomeReference" lazy="false" cascade="merge,persist,save-update,lock,refresh" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`somereference_somereference_name`"/>
+		</many-to-one>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+	</class>
+	<joined-subclass name="testinheritance.impl.Child2Impl" entity-name="Child2" abstract="false" lazy="false" extends="ParentOne" table="`child2`">
+		<meta attribute="eclassName" inherit="false">Child2</meta>
+		<meta attribute="epackage" inherit="false">http://xsd.tns.example.com/testinheritance/model</meta>
+		<key>
+			<column name="`parentzero_e_id`"/>
+		</key>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<many-to-one name="someReference" entity-name="SomeReference" lazy="false" cascade="merge,persist,save-update,lock,refresh" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`somereference_somereference_name`"/>
+		</many-to-one>
+		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`age`"/>
+		</property>
+	</joined-subclass>
+	<class name="testinheritance.impl.SomeReferenceImpl" entity-name="SomeReference" abstract="false" lazy="false" table="`somereference`">
+		<meta attribute="eclassName" inherit="false">SomeReference</meta>
+		<meta attribute="epackage" inherit="false">http://xsd.tns.example.com/testinheritance/model</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a6370b867
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,34 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.resource.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" discriminator-value="Head" table="`head`">
+		<meta attribute="eclassName">Head</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/resource</meta>
+		<id name="hair" type="java.lang.String">
+			<column not-null="true" unique="false" name="`hair`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="headdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.resource.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/resource</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<discriminator type="string">
+			<column name="dtype" index="persondtype" length="255" not-null="true"/>
+		</discriminator>
+		<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="head" entity-name="Head" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_head" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`head_head_hair`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..826256e39
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,28 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.resource.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" table="`head`">
+		<meta attribute="eclassName" inherit="false">Head</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/resource</meta>
+		<id name="hair" type="java.lang.String">
+			<column not-null="true" unique="false" name="`hair`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.resource.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/resource</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<many-to-one name="head" entity-name="Head" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_head" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`head_head_hair`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..826256e39
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,28 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.resource.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" table="`head`">
+		<meta attribute="eclassName" inherit="false">Head</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/resource</meta>
+		<id name="hair" type="java.lang.String">
+			<column not-null="true" unique="false" name="`hair`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.resource.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/resource</meta>
+		<id name="name" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<many-to-one name="head" entity-name="Head" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_head" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`head_head_hair`"/>
+		</many-to-one>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceUnloadAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceUnloadAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..8cb9525f8
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceUnloadAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,46 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.resourceunload.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/resourceunload</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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.resourceunload.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/resourceunload</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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceUnloadAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceUnloadAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..60d14181f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceUnloadAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,40 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.resourceunload.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/resourceunload</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.resourceunload.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/resourceunload</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceUnloadAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceUnloadAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..60d14181f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceUnloadAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,40 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.resourceunload.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/resourceunload</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.resourceunload.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/resourceunload</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SecondarytableInheritanceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SecondarytableInheritanceAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..e55726209
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SecondarytableInheritanceAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.secondary.impl.GenericImpl" entity-name="Generic" abstract="false" lazy="false" discriminator-value="Generic" table="`GENERIC`">
+		<meta attribute="eclassName">Generic</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/secondary</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`ID`"/>
+		</id>
+		<discriminator type="string">
+			<column name="DTYPE" index="GENERICDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.secondary.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" extends="Generic" discriminator-value="Person">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/secondary</meta>
+		<join table="`PERSON_ADDRESS`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+				<column not-null="false" unique="false" name="`ADDRESS`"/>
+			</property>
+		</join>
+		<join table="`PERSON_PHOTO`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
+				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
+			</property>
+		</join>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SecondarytableInheritanceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SecondarytableInheritanceAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2f3e8cce1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SecondarytableInheritanceAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.secondary.impl.GenericImpl" entity-name="Generic" abstract="false" lazy="false" discriminator-value="Generic" table="`GENERIC`">
+		<meta attribute="eclassName" inherit="false">Generic</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/secondary</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`ID`"/>
+		</id>
+		<discriminator type="string">
+			<column name="DTYPE" index="GENERICDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.secondary.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" extends="Generic" discriminator-value="Person">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/secondary</meta>
+		<join table="`PERSON_ADDRESS`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+				<column not-null="false" unique="false" name="`ADDRESS`"/>
+			</property>
+		</join>
+		<join table="`PERSON_PHOTO`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
+				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
+			</property>
+		</join>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SecondarytableInheritanceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SecondarytableInheritanceAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..2f3e8cce1
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SecondarytableInheritanceAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,38 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.secondary.impl.GenericImpl" entity-name="Generic" abstract="false" lazy="false" discriminator-value="Generic" table="`GENERIC`">
+		<meta attribute="eclassName" inherit="false">Generic</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/secondary</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`ID`"/>
+		</id>
+		<discriminator type="string">
+			<column name="DTYPE" index="GENERICDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.secondary.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" extends="Generic" discriminator-value="Person">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/secondary</meta>
+		<join table="`PERSON_ADDRESS`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
+				<column not-null="false" unique="false" name="`ADDRESS`"/>
+			</property>
+		</join>
+		<join table="`PERSON_PHOTO`">
+			<key>
+				<column name="`ID`"/>
+			</key>
+			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
+				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
+			</property>
+		</join>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SimplenmAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SimplenmAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..a7872d4b7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SimplenmAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,57 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.simplenm.impl.MeImpl" entity-name="Me" abstract="false" lazy="false" discriminator-value="Me" table="`me`">
+		<meta attribute="eclassName">Me</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/issues/simplenm</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 type="string">
+			<column name="dtype" index="medtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="you" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`me_you`">
+			<key update="true">
+				<column name="`me_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`me_you_idx`"/>
+			<many-to-many entity-name="You" unique="false" foreign-key="me_you">
+				<column name="`you_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.simplenm.impl.YouImpl" entity-name="You" abstract="false" lazy="false" discriminator-value="You" table="`you`">
+		<meta attribute="eclassName">You</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/issues/simplenm</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 type="string">
+			<column name="dtype" index="youdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="me" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`you_me`">
+			<key update="true">
+				<column name="`you_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`you_me_idx`"/>
+			<many-to-many entity-name="Me" unique="false" foreign-key="you_me">
+				<column name="`me_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SimplenmAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SimplenmAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..66f436438
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SimplenmAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,51 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.simplenm.impl.MeImpl" entity-name="Me" abstract="false" lazy="false" table="`me`">
+		<meta attribute="eclassName" inherit="false">Me</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/simplenm</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="you" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`me_you`">
+			<key update="true">
+				<column name="`me_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`me_you_idx`"/>
+			<many-to-many entity-name="You" unique="false" foreign-key="me_you">
+				<column name="`you_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.simplenm.impl.YouImpl" entity-name="You" abstract="false" lazy="false" table="`you`">
+		<meta attribute="eclassName" inherit="false">You</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/simplenm</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="me" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`you_me`">
+			<key update="true">
+				<column name="`you_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`you_me_idx`"/>
+			<many-to-many entity-name="Me" unique="false" foreign-key="you_me">
+				<column name="`me_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SimplenmAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SimplenmAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..66f436438
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SimplenmAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,51 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.simplenm.impl.MeImpl" entity-name="Me" abstract="false" lazy="false" table="`me`">
+		<meta attribute="eclassName" inherit="false">Me</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/simplenm</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="you" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`me_you`">
+			<key update="true">
+				<column name="`me_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`me_you_idx`"/>
+			<many-to-many entity-name="You" unique="false" foreign-key="me_you">
+				<column name="`you_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.issues.simplenm.impl.YouImpl" entity-name="You" abstract="false" lazy="false" table="`you`">
+		<meta attribute="eclassName" inherit="false">You</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/simplenm</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="me" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`you_me`">
+			<key update="true">
+				<column name="`you_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`you_me_idx`"/>
+			<many-to-many entity-name="Me" unique="false" foreign-key="you_me">
+				<column name="`me_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SupInterfacesAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SupInterfacesAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..4fc2e3560
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SupInterfacesAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,101 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+		<meta attribute="eclassName">Book</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`" length="50"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+		<meta attribute="eclassName">Library</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+		<meta attribute="eclassName">Writer</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</meta>
+		<cache usage="read-write"/>
+		<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 type="string">
+			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SupInterfacesAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SupInterfacesAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..49fc6f3dc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SupInterfacesAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,92 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`" length="50"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SupInterfacesAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SupInterfacesAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..49fc6f3dc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/SupInterfacesAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,92 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`" length="50"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.issues.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+	</class>
+	<class entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="schrijvers">
+				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_writers_idx`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<cache usage="read-write"/>
+			<key update="true" foreign-key="library_books">
+				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/issues/supinterfaces</meta>
+		<cache usage="read-write"/>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`" length="50"/>
+		</property>
+		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<cache usage="read-write"/>
+			<key update="true">
+				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/TopClassesAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/TopClassesAction_mysql_a_o_hibernate.hbm.xml
new file mode 100755
index 000000000..6197d86aa
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/TopClassesAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,80 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.AbstractSuperImpl" entity-name="AbstractSuper" abstract="false" lazy="false" discriminator-value="AbstractSuper" table="`abstractsuper`">
+		<meta attribute="eclassName">AbstractSuper</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</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 type="string">
+			<column name="dtype" index="abstractsuperdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.MImpl" entity-name="M" abstract="false" lazy="false" extends="AbstractSuper" discriminator-value="M">
+		<meta attribute="eclassName">M</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<list name="p" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`m_p`">
+			<key update="true">
+				<column name="`m_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`m_p_idx`"/>
+			<many-to-many entity-name="P" unique="false" foreign-key="m_p">
+				<column name="`p_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.MListImpl" entity-name="MList" abstract="false" lazy="false" extends="AbstractSuper" discriminator-value="MList">
+		<meta attribute="eclassName">MList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<list name="m" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="mlist_m">
+				<column name="`mlist_m_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mlist_m_idx`"/>
+			<one-to-many entity-name="M"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.PImpl" entity-name="P" abstract="false" lazy="false" extends="AbstractSuper" discriminator-value="P">
+		<meta attribute="eclassName">P</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<list name="m" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`p_m`">
+			<key update="true">
+				<column name="`p_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`p_m_idx`"/>
+			<many-to-many entity-name="M" unique="false" foreign-key="p_m">
+				<column name="`m_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.PListImpl" entity-name="PList" abstract="false" lazy="false" extends="AbstractSuper" discriminator-value="PList">
+		<meta attribute="eclassName">PList</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<list name="p" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="plist_p">
+				<column name="`plist_p_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`plist_p_idx`"/>
+			<one-to-many entity-name="P"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.RImpl" entity-name="R" abstract="false" lazy="false" extends="AbstractSuper" discriminator-value="R">
+		<meta attribute="eclassName">R</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<many-to-one name="plist" entity-name="PList" lazy="false" cascade="all" foreign-key="r_plist" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`plist_plist_e_id`"/>
+		</many-to-one>
+		<many-to-one name="mlist" entity-name="MList" lazy="false" cascade="all" foreign-key="r_mlist" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`mlist_mlist_e_id`"/>
+		</many-to-one>
+	</subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/TopClassesAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/TopClassesAction_mysql_e_o_hibernate.hbm.xml
new file mode 100755
index 000000000..749d23c72
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/TopClassesAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,92 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.AbstractSuperImpl" entity-name="AbstractSuper" abstract="false" lazy="false" table="`abstractsuper`">
+		<meta attribute="eclassName" inherit="false">AbstractSuper</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.MImpl" entity-name="M" abstract="false" lazy="false" extends="AbstractSuper" table="`m`">
+		<meta attribute="eclassName" inherit="false">M</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<key>
+			<column name="`abstractsuper_e_id`"/>
+		</key>
+		<list name="p" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`m_p`">
+			<key update="true">
+				<column name="`m_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`m_p_idx`"/>
+			<many-to-many entity-name="P" unique="false" foreign-key="m_p">
+				<column name="`p_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.MListImpl" entity-name="MList" abstract="false" lazy="false" extends="AbstractSuper" table="`mlist`">
+		<meta attribute="eclassName" inherit="false">MList</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<key>
+			<column name="`abstractsuper_e_id`"/>
+		</key>
+		<list name="m" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="mlist_m">
+				<column name="`mlist_m_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mlist_m_idx`"/>
+			<one-to-many entity-name="M"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.PImpl" entity-name="P" abstract="false" lazy="false" extends="AbstractSuper" table="`p`">
+		<meta attribute="eclassName" inherit="false">P</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<key>
+			<column name="`abstractsuper_e_id`"/>
+		</key>
+		<list name="m" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`p_m`">
+			<key update="true">
+				<column name="`p_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`p_m_idx`"/>
+			<many-to-many entity-name="M" unique="false" foreign-key="p_m">
+				<column name="`m_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.PListImpl" entity-name="PList" abstract="false" lazy="false" extends="AbstractSuper" table="`plist`">
+		<meta attribute="eclassName" inherit="false">PList</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<key>
+			<column name="`abstractsuper_e_id`"/>
+		</key>
+		<list name="p" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="plist_p">
+				<column name="`plist_p_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`plist_p_idx`"/>
+			<one-to-many entity-name="P"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.RImpl" entity-name="R" abstract="false" lazy="false" extends="AbstractSuper" table="`r`">
+		<meta attribute="eclassName" inherit="false">R</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<key>
+			<column name="`abstractsuper_e_id`"/>
+		</key>
+		<many-to-one name="plist" entity-name="PList" lazy="false" cascade="all" foreign-key="r_plist" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`plist_plist_e_id`"/>
+		</many-to-one>
+		<many-to-one name="mlist" entity-name="MList" lazy="false" cascade="all" foreign-key="r_mlist" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`mlist_mlist_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/TopClassesAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/TopClassesAction_mysql_s_o_hibernate.hbm.xml
new file mode 100755
index 000000000..749d23c72
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/TopClassesAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,92 @@
+<?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">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.AbstractSuperImpl" entity-name="AbstractSuper" abstract="false" lazy="false" table="`abstractsuper`">
+		<meta attribute="eclassName" inherit="false">AbstractSuper</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.MImpl" entity-name="M" abstract="false" lazy="false" extends="AbstractSuper" table="`m`">
+		<meta attribute="eclassName" inherit="false">M</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<key>
+			<column name="`abstractsuper_e_id`"/>
+		</key>
+		<list name="p" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`m_p`">
+			<key update="true">
+				<column name="`m_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`m_p_idx`"/>
+			<many-to-many entity-name="P" unique="false" foreign-key="m_p">
+				<column name="`p_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.MListImpl" entity-name="MList" abstract="false" lazy="false" extends="AbstractSuper" table="`mlist`">
+		<meta attribute="eclassName" inherit="false">MList</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<key>
+			<column name="`abstractsuper_e_id`"/>
+		</key>
+		<list name="m" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="mlist_m">
+				<column name="`mlist_m_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`mlist_m_idx`"/>
+			<one-to-many entity-name="M"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.PImpl" entity-name="P" abstract="false" lazy="false" extends="AbstractSuper" table="`p`">
+		<meta attribute="eclassName" inherit="false">P</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<key>
+			<column name="`abstractsuper_e_id`"/>
+		</key>
+		<list name="m" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`p_m`">
+			<key update="true">
+				<column name="`p_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`p_m_idx`"/>
+			<many-to-many entity-name="M" unique="false" foreign-key="p_m">
+				<column name="`m_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.PListImpl" entity-name="PList" abstract="false" lazy="false" extends="AbstractSuper" table="`plist`">
+		<meta attribute="eclassName" inherit="false">PList</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<key>
+			<column name="`abstractsuper_e_id`"/>
+		</key>
+		<list name="p" lazy="true" cascade="all,delete-orphan">
+			<key update="true" foreign-key="plist_p">
+				<column name="`plist_p_e_id`" not-null="false" unique="false"/>
+			</key>
+			<list-index column="`plist_p_idx`"/>
+			<one-to-many entity-name="P"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.issues.topclasses.impl.RImpl" entity-name="R" abstract="false" lazy="false" extends="AbstractSuper" table="`r`">
+		<meta attribute="eclassName" inherit="false">R</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/store/test/issues/topclasses</meta>
+		<key>
+			<column name="`abstractsuper_e_id`"/>
+		</key>
+		<many-to-one name="plist" entity-name="PList" lazy="false" cascade="all" foreign-key="r_plist" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`plist_plist_e_id`"/>
+		</many-to-one>
+		<many-to-one name="mlist" entity-name="MList" lazy="false" cascade="all" foreign-key="r_mlist" insert="true" update="true" not-null="true" unique="true">
+			<column not-null="true" unique="false" name="`mlist_mlist_e_id`"/>
+		</many-to-one>
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file