New structure

51 files changed, 2951 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