Regenerated all hbm files

54 files changed, 0 insertions, 5034 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/AnyTypeAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/AnyTypeAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 33e37fcec..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/AnyTypeAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.AImpl" entity-name="A" abstract="false" lazy="false" table="`a`">
-		<meta attribute="eclassName">A</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/anytype</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<property name="doub" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
-			<column not-null="false" unique="false" name="`doub`"/>
-		</property>
-		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
-			<column not-null="false" unique="false" name="`lon`"/>
-		</property>
-		<many-to-one name="myB" entity-name="B" cascade="merge,persist,save-update,lock,refresh" foreign-key="a_myb" lazy="false" insert="true" update="true" not-null="true">
-			<column not-null="true" unique="false" name="`b_myb_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.BImpl" entity-name="B" abstract="false" lazy="false" table="`b`">
-		<meta attribute="eclassName">B</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/anytype</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.TestAnyImpl" entity-name="TestAny" abstract="false" lazy="false" table="`testany`">
-		<meta attribute="eclassName">TestAny</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/anytype</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<any name="singleAnyType" id-type="long" cascade="all">
-			<column not-null="false" unique="false" name="`singleanytype_type`"/>
-			<column not-null="false" unique="false" name="`singleanytype_id`"/>
-		</any>
-		<list name="multiAnyType" table="`testany_multianytype`" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="testany_multianytype">
-				<column name="`testany_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`testany_multianytype_idx`"/>
-			<many-to-any id-type="long">
-				<column not-null="true" unique="false" name="`multianytype_type`"/>
-				<column not-null="true" unique="false" name="`multianytype_id`"/>
-			</many-to-any>
-		</list>
-		<list name="myAny" table="`testany_myany`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`testany_myany_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`testany_myany_idx`"/>
-			<one-to-many entity-name="TestAny_myAny"/>
-		</list>
-		<list name="any" table="`testany_any`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`testany_any_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`testany_any_idx`"/>
-			<one-to-many entity-name="TestAny_any"/>
-		</list>
-	</class>
-	<class entity-name="TestAny_myAny" lazy="false" table="`testany_myany`">
-		<meta attribute="featureMap">TestAny</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`myany_name`"/>
-		</property>
-		<any name="singleAnyType" id-type="long" cascade="all">
-			<column not-null="false" unique="false" name="`myany_`myany_singleanytype_type``"/>
-			<column not-null="false" unique="false" name="`myany_`myany_singleanytype_id``"/>
-		</any>
-		<list name="multiAnyType" table="`myany_testany_multianytype`" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="testany_multianytype">
-				<column name="`myany_testany_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`myany_testany_multianytype_idx`"/>
-			<many-to-any id-type="long">
-				<column not-null="true" unique="false" name="`myany_`myany_multianytype_type``"/>
-				<column not-null="true" unique="false" name="`myany_`myany_multianytype_id``"/>
-			</many-to-any>
-		</list>
-		<list name="any" table="`myany_testany_any`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`myany_testany_any_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`myany_testany_any_idx`"/>
-			<one-to-many entity-name="TestAny_any"/>
-		</list>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-	<class entity-name="TestAny_any" lazy="false" table="`testany_any`">
-		<meta attribute="featureMap">TestAny</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`any_name`"/>
-		</property>
-		<any name="singleAnyType" id-type="long" cascade="all">
-			<column not-null="false" unique="false" name="`any_`any_singleanytype_type``"/>
-			<column not-null="false" unique="false" name="`any_`any_singleanytype_id``"/>
-		</any>
-		<list name="multiAnyType" table="`any_testany_multianytype`" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="testany_multianytype">
-				<column name="`any_testany_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`any_testany_multianytype_idx`"/>
-			<many-to-any id-type="long">
-				<column not-null="true" unique="false" name="`any_`any_multianytype_type``"/>
-				<column not-null="true" unique="false" name="`any_`any_multianytype_id``"/>
-			</many-to-any>
-		</list>
-		<list name="myAny" table="`any_testany_myany`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`any_testany_myany_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`any_testany_myany_idx`"/>
-			<one-to-many entity-name="TestAny_myAny"/>
-		</list>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 0f4816341..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl.TestDateImpl" entity-name="TestDate" abstract="false" lazy="false" discriminator-value="TestDate" table="`testdate`">
-		<meta attribute="eclassName">TestDate</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/datetime</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="testdatedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="date" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
-			<column not-null="true" unique="false" name="`date`"/>
-		</property>
-		<property name="datetime" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDateTime">
-			<column not-null="true" unique="false" name="`datetime`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 6ea4c6528..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl.TestDateImpl" entity-name="TestDate" abstract="false" lazy="false" table="`testdate`">
-		<meta attribute="eclassName">TestDate</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/datetime</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="date" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
-			<column not-null="true" unique="false" name="`date`"/>
-		</property>
-		<property name="datetime" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDateTime">
-			<column not-null="true" unique="false" name="`datetime`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 6ea4c6528..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DateTimeAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl.TestDateImpl" entity-name="TestDate" abstract="false" lazy="false" table="`testdate`">
-		<meta attribute="eclassName">TestDate</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/datetime</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="date" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
-			<column not-null="true" unique="false" name="`date`"/>
-		</property>
-		<property name="datetime" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDateTime">
-			<column not-null="true" unique="false" name="`datetime`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index ffef8e88e..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.ComplexTypeImpl" entity-name="ComplexType" abstract="false" lazy="false" discriminator-value="ComplexType" table="`complextype`">
-		<meta attribute="eclassName">ComplexType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentroot</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="complextypedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="test" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`test`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.DocumentRootImpl" entity-name="documentroot.DocumentRoot" abstract="false" lazy="false" discriminator-value="documentroot.DocumentRoot" table="`documentroot_documentroot`">
-		<meta attribute="eclassName">DocumentRoot</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentroot</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="documentroot_documentrootdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="mixed" table="`documentroot_documentroot_mixed`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`documentroot_mixed_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`documentroot_mixed_idx`"/>
-			<one-to-many entity-name="DocumentRoot_mixed"/>
-		</list>
-	</class>
-	<class entity-name="DocumentRoot_mixed" lazy="false" table="`documentroot_mixed`">
-		<meta attribute="featureMap">documentroot.DocumentRoot</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<map name="xMLNSPrefixMap" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`mixed_documentroot_xmlnsprefixmap_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="java.lang.String"/>
-			<element type="java.lang.String"/>
-		</map>
-		<map name="xSISchemaLocation" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`mixed_documentroot_xsischemalocation_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="java.lang.String"/>
-			<element type="java.lang.String"/>
-		</map>
-		<property name="otherTest" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_othertest`"/>
-		</property>
-		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_test`"/>
-		</property>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 345e08799..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.ComplexTypeImpl" entity-name="ComplexType" abstract="false" lazy="false" table="`complextype`">
-		<meta attribute="eclassName">ComplexType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentroot</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="test" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`test`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.DocumentRootImpl" entity-name="documentroot.DocumentRoot" abstract="false" lazy="false" table="`documentroot_documentroot`">
-		<meta attribute="eclassName">DocumentRoot</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentroot</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="mixed" table="`documentroot_documentroot_mixed`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`documentroot_mixed_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`documentroot_mixed_idx`"/>
-			<one-to-many entity-name="DocumentRoot_mixed"/>
-		</list>
-	</class>
-	<class entity-name="DocumentRoot_mixed" lazy="false" table="`documentroot_mixed`">
-		<meta attribute="featureMap">documentroot.DocumentRoot</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<map name="xMLNSPrefixMap" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`mixed_documentroot_xmlnsprefixmap_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="java.lang.String"/>
-			<element type="java.lang.String"/>
-		</map>
-		<map name="xSISchemaLocation" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`mixed_documentroot_xsischemalocation_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="java.lang.String"/>
-			<element type="java.lang.String"/>
-		</map>
-		<property name="otherTest" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_othertest`"/>
-		</property>
-		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_test`"/>
-		</property>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 345e08799..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DocumentRootAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.ComplexTypeImpl" entity-name="ComplexType" abstract="false" lazy="false" table="`complextype`">
-		<meta attribute="eclassName">ComplexType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentroot</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="test" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`test`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl.DocumentRootImpl" entity-name="documentroot.DocumentRoot" abstract="false" lazy="false" table="`documentroot_documentroot`">
-		<meta attribute="eclassName">DocumentRoot</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/documentroot</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="mixed" table="`documentroot_documentroot_mixed`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`documentroot_mixed_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`documentroot_mixed_idx`"/>
-			<one-to-many entity-name="DocumentRoot_mixed"/>
-		</list>
-	</class>
-	<class entity-name="DocumentRoot_mixed" lazy="false" table="`documentroot_mixed`">
-		<meta attribute="featureMap">documentroot.DocumentRoot</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<map name="xMLNSPrefixMap" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`mixed_documentroot_xmlnsprefixmap_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="java.lang.String"/>
-			<element type="java.lang.String"/>
-		</map>
-		<map name="xSISchemaLocation" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`mixed_documentroot_xsischemalocation_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="java.lang.String"/>
-			<element type="java.lang.String"/>
-		</map>
-		<property name="otherTest" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_othertest`"/>
-		</property>
-		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_test`"/>
-		</property>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 5f366773f..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.duration.impl.DurationTestImpl" entity-name="DurationTest" abstract="false" lazy="false" discriminator-value="DurationTest" table="`durationtest`">
-		<meta attribute="eclassName">DurationTest</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/duration</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="durationtestdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="duration" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDuration">
-			<column not-null="false" unique="false" name="`duration`"/>
-		</property>
-		<list name="durations" table="`durationtest_durations`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`durationtest_durations_name`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`durationtest_durations_idx`"/>
-			<element type="org.eclipse.emf.teneo.hibernate.mapping.XSDDuration"/>
-		</list>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 6deb20c4c..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.duration.impl.DurationTestImpl" entity-name="DurationTest" abstract="false" lazy="false" table="`durationtest`">
-		<meta attribute="eclassName">DurationTest</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/duration</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="duration" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDuration">
-			<column not-null="false" unique="false" name="`duration`"/>
-		</property>
-		<list name="durations" table="`durationtest_durations`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`durationtest_durations_name`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`durationtest_durations_idx`"/>
-			<element type="org.eclipse.emf.teneo.hibernate.mapping.XSDDuration"/>
-		</list>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 6deb20c4c..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/DurationAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.duration.impl.DurationTestImpl" entity-name="DurationTest" abstract="false" lazy="false" table="`durationtest`">
-		<meta attribute="eclassName">DurationTest</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/duration</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="duration" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDuration">
-			<column not-null="false" unique="false" name="`duration`"/>
-		</property>
-		<list name="durations" table="`durationtest_durations`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`durationtest_durations_name`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`durationtest_durations_idx`"/>
-			<element type="org.eclipse.emf.teneo.hibernate.mapping.XSDDuration"/>
-		</list>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 53627f778..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
-		<param name="edatatype">CategoryObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<map name="writers" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_writers">
-				<column name="`book_writers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="java.lang.String"/>
-			<one-to-many entity-name="Writer"/>
-		</map>
-		<map name="keyWords" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`book_keywords_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="java.lang.String"/>
-			<element type="java.lang.String"/>
-		</map>
-		<map name="cityByWriter" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`book_citybywriter_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key-many-to-many entity-name="Writer"/>
-			<element type="java.lang.String"/>
-		</map>
-		<map name="categoryByDate" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`book_categorybydate_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="timestamp"/>
-			<element>
-				<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-					<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
-					<param name="eclassifier">Category</param>
-					<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
-				</type>
-			</element>
-		</map>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 70d20ce12..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
-		<param name="edatatype">CategoryObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<map name="writers" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_writers">
-				<column name="`book_writers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="java.lang.String"/>
-			<one-to-many entity-name="Writer"/>
-		</map>
-		<map name="keyWords" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`book_keywords_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="java.lang.String"/>
-			<element type="java.lang.String"/>
-		</map>
-		<map name="cityByWriter" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`book_citybywriter_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key-many-to-many entity-name="Writer"/>
-			<element type="java.lang.String"/>
-		</map>
-		<map name="categoryByDate" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`book_categorybydate_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="timestamp"/>
-			<element>
-				<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-					<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
-					<param name="eclassifier">Category</param>
-					<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
-				</type>
-			</element>
-		</map>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 70d20ce12..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
-		<param name="edatatype">CategoryObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<map name="writers" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_writers">
-				<column name="`book_writers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="java.lang.String"/>
-			<one-to-many entity-name="Writer"/>
-		</map>
-		<map name="keyWords" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`book_keywords_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="java.lang.String"/>
-			<element type="java.lang.String"/>
-		</map>
-		<map name="cityByWriter" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`book_citybywriter_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key-many-to-many entity-name="Writer"/>
-			<element type="java.lang.String"/>
-		</map>
-		<map name="categoryByDate" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`book_categorybydate_e_id`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="timestamp"/>
-			<element>
-				<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-					<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
-					<param name="eclassifier">Category</param>
-					<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
-				</type>
-			</element>
-		</map>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index f2d449df0..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
-		<param name="edatatype">CategoryObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<list name="writers" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_writers">
-				<column name="`book_writers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`book_writers_idx`"/>
-			<one-to-many entity-name="StringToWriterMapEntry"/>
-		</list>
-		<list name="keyWords" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_keywords">
-				<column name="`book_keywords_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`book_keywords_idx`"/>
-			<one-to-many entity-name="StringToStringMapEntry"/>
-		</list>
-		<list name="cityByWriter" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_citybywriter">
-				<column name="`book_citybywriter_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`book_citybywriter_idx`"/>
-			<one-to-many entity-name="WriterToStringMapEntry"/>
-		</list>
-		<list name="categoryByDate" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_categorybydate">
-				<column name="`book_categorybydate_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`book_categorybydate_idx`"/>
-			<one-to-many entity-name="DateToCategoryMapEntry"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.DateToCategoryMapEntryImpl" entity-name="DateToCategoryMapEntry" abstract="false" lazy="false" discriminator-value="DateToCategoryMapEntry" table="`datetocategorymapentry`">
-		<meta attribute="eclassName">DateToCategoryMapEntry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="datetocategorymapentrydtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
-			<column not-null="false" unique="false" name="`key`"/>
-		</property>
-		<property name="value" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`value`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
-				<param name="eclassifier">Category</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
-			</type>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToStringMapEntryImpl" entity-name="StringToStringMapEntry" abstract="false" lazy="false" discriminator-value="StringToStringMapEntry" table="`stringtostringmapentry`">
-		<meta attribute="eclassName">StringToStringMapEntry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="stringtostringmapentrydtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`key`"/>
-		</property>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" discriminator-value="StringToWriterMapEntry" table="`stringtowritermapentry`">
-		<meta attribute="eclassName">StringToWriterMapEntry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="stringtowritermapentrydtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`key`"/>
-		</property>
-		<many-to-one name="value" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="stringtowritermapentry_value" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`writer_value_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" discriminator-value="WriterToStringMapEntry" table="`writertostringmapentry`">
-		<meta attribute="eclassName">WriterToStringMapEntry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="writertostringmapentrydtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<many-to-one name="key" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="writertostringmapentry_key" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`writer_key_e_id`"/>
-		</many-to-one>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`value`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 267bf7c8b..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
-		<param name="edatatype">CategoryObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<list name="writers" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_writers">
-				<column name="`book_writers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`book_writers_idx`"/>
-			<one-to-many entity-name="StringToWriterMapEntry"/>
-		</list>
-		<list name="keyWords" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_keywords">
-				<column name="`book_keywords_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`book_keywords_idx`"/>
-			<one-to-many entity-name="StringToStringMapEntry"/>
-		</list>
-		<list name="cityByWriter" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_citybywriter">
-				<column name="`book_citybywriter_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`book_citybywriter_idx`"/>
-			<one-to-many entity-name="WriterToStringMapEntry"/>
-		</list>
-		<list name="categoryByDate" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_categorybydate">
-				<column name="`book_categorybydate_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`book_categorybydate_idx`"/>
-			<one-to-many entity-name="DateToCategoryMapEntry"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.DateToCategoryMapEntryImpl" entity-name="DateToCategoryMapEntry" abstract="false" lazy="false" table="`datetocategorymapentry`">
-		<meta attribute="eclassName">DateToCategoryMapEntry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
-			<column not-null="false" unique="false" name="`key`"/>
-		</property>
-		<property name="value" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`value`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
-				<param name="eclassifier">Category</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
-			</type>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToStringMapEntryImpl" entity-name="StringToStringMapEntry" abstract="false" lazy="false" table="`stringtostringmapentry`">
-		<meta attribute="eclassName">StringToStringMapEntry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`key`"/>
-		</property>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" table="`stringtowritermapentry`">
-		<meta attribute="eclassName">StringToWriterMapEntry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`key`"/>
-		</property>
-		<many-to-one name="value" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="stringtowritermapentry_value" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`writer_value_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" table="`writertostringmapentry`">
-		<meta attribute="eclassName">WriterToStringMapEntry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<many-to-one name="key" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="writertostringmapentry_key" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`writer_key_e_id`"/>
-		</many-to-one>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`value`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 267bf7c8b..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EMapAsListAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="emap.CategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
-		<param name="edatatype">CategoryObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<list name="writers" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_writers">
-				<column name="`book_writers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`book_writers_idx`"/>
-			<one-to-many entity-name="StringToWriterMapEntry"/>
-		</list>
-		<list name="keyWords" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_keywords">
-				<column name="`book_keywords_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`book_keywords_idx`"/>
-			<one-to-many entity-name="StringToStringMapEntry"/>
-		</list>
-		<list name="cityByWriter" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_citybywriter">
-				<column name="`book_citybywriter_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`book_citybywriter_idx`"/>
-			<one-to-many entity-name="WriterToStringMapEntry"/>
-		</list>
-		<list name="categoryByDate" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_categorybydate">
-				<column name="`book_categorybydate_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`book_categorybydate_idx`"/>
-			<one-to-many entity-name="DateToCategoryMapEntry"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.DateToCategoryMapEntryImpl" entity-name="DateToCategoryMapEntry" abstract="false" lazy="false" table="`datetocategorymapentry`">
-		<meta attribute="eclassName">DateToCategoryMapEntry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
-			<column not-null="false" unique="false" name="`key`"/>
-		</property>
-		<property name="value" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`value`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
-				<param name="eclassifier">Category</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
-			</type>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToStringMapEntryImpl" entity-name="StringToStringMapEntry" abstract="false" lazy="false" table="`stringtostringmapentry`">
-		<meta attribute="eclassName">StringToStringMapEntry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`key`"/>
-		</property>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.StringToWriterMapEntryImpl" entity-name="StringToWriterMapEntry" abstract="false" lazy="false" table="`stringtowritermapentry`">
-		<meta attribute="eclassName">StringToWriterMapEntry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`key`"/>
-		</property>
-		<many-to-one name="value" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="stringtowritermapentry_value" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`writer_value_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl.WriterToStringMapEntryImpl" entity-name="WriterToStringMapEntry" abstract="false" lazy="false" table="`writertostringmapentry`">
-		<meta attribute="eclassName">WriterToStringMapEntry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<many-to-one name="key" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="writertostringmapentry_key" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`writer_key_e_id`"/>
-		</many-to-one>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`value`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index cf63bdbcb..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" discriminator-value="Element" table="`element`">
-		<meta attribute="eclassName">Element</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="elementdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="nameMap" table="`element_namemap`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`element_namemap_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`element_namemap_idx`"/>
-			<one-to-many entity-name="Element_nameMap"/>
-		</list>
-	</class>
-	<class entity-name="Element_nameMap" lazy="false" table="`element_namemap`">
-		<meta attribute="featureMap">Element</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="names" entity-name="NameList" lazy="false" cascade="all" foreign-key="element_names" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`namemap_namelist_names_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.FeatureImpl" entity-name="Feature" abstract="false" lazy="false" discriminator-value="Feature" table="`feature`">
-		<meta attribute="eclassName">Feature</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="featuredtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="aMap" table="`feature_amap`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`feature_amap_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`feature_amap_idx`"/>
-			<one-to-many entity-name="Feature_aMap"/>
-		</list>
-	</class>
-	<class entity-name="Feature_aMap" lazy="false" table="`feature_amap`">
-		<meta attribute="featureMap">Feature</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`amap_name`"/>
-		</property>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
-			<column not-null="false" unique="false" name="`amap_value`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.MixedImpl" entity-name="Mixed" abstract="false" lazy="false" discriminator-value="Mixed" table="`mixed`">
-		<meta attribute="eclassName">Mixed</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="mixeddtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="mixed" table="`mixed_mixed`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`mixed_mixed_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`mixed_mixed_idx`"/>
-			<one-to-many entity-name="Mixed_mixed"/>
-		</list>
-	</class>
-	<class entity-name="Mixed_mixed" lazy="false" table="`mixed_mixed`">
-		<meta attribute="featureMap">Mixed</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_name`"/>
-		</property>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
-			<column not-null="false" unique="false" name="`mixed_value`"/>
-		</property>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.NameListImpl" entity-name="NameList" abstract="false" lazy="false" discriminator-value="NameList" table="`namelist`">
-		<meta attribute="eclassName">NameList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="namelistdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="firstName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`firstname`"/>
-		</property>
-		<property name="middleName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`middlename`"/>
-		</property>
-		<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`lastname`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 066511834..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" table="`element`">
-		<meta attribute="eclassName">Element</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="nameMap" table="`element_namemap`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`element_namemap_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`element_namemap_idx`"/>
-			<one-to-many entity-name="Element_nameMap"/>
-		</list>
-	</class>
-	<class entity-name="Element_nameMap" lazy="false" table="`element_namemap`">
-		<meta attribute="featureMap">Element</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="names" entity-name="NameList" lazy="false" cascade="all" foreign-key="element_names" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`namemap_namelist_names_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.FeatureImpl" entity-name="Feature" abstract="false" lazy="false" table="`feature`">
-		<meta attribute="eclassName">Feature</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="aMap" table="`feature_amap`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`feature_amap_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`feature_amap_idx`"/>
-			<one-to-many entity-name="Feature_aMap"/>
-		</list>
-	</class>
-	<class entity-name="Feature_aMap" lazy="false" table="`feature_amap`">
-		<meta attribute="featureMap">Feature</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`amap_name`"/>
-		</property>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
-			<column not-null="false" unique="false" name="`amap_value`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.MixedImpl" entity-name="Mixed" abstract="false" lazy="false" table="`mixed`">
-		<meta attribute="eclassName">Mixed</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="mixed" table="`mixed_mixed`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`mixed_mixed_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`mixed_mixed_idx`"/>
-			<one-to-many entity-name="Mixed_mixed"/>
-		</list>
-	</class>
-	<class entity-name="Mixed_mixed" lazy="false" table="`mixed_mixed`">
-		<meta attribute="featureMap">Mixed</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_name`"/>
-		</property>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
-			<column not-null="false" unique="false" name="`mixed_value`"/>
-		</property>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.NameListImpl" entity-name="NameList" abstract="false" lazy="false" table="`namelist`">
-		<meta attribute="eclassName">NameList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="firstName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`firstname`"/>
-		</property>
-		<property name="middleName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`middlename`"/>
-		</property>
-		<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`lastname`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 066511834..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/EcoreAttrsAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" table="`element`">
-		<meta attribute="eclassName">Element</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="nameMap" table="`element_namemap`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`element_namemap_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`element_namemap_idx`"/>
-			<one-to-many entity-name="Element_nameMap"/>
-		</list>
-	</class>
-	<class entity-name="Element_nameMap" lazy="false" table="`element_namemap`">
-		<meta attribute="featureMap">Element</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="names" entity-name="NameList" lazy="false" cascade="all" foreign-key="element_names" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`namemap_namelist_names_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.FeatureImpl" entity-name="Feature" abstract="false" lazy="false" table="`feature`">
-		<meta attribute="eclassName">Feature</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="aMap" table="`feature_amap`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`feature_amap_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`feature_amap_idx`"/>
-			<one-to-many entity-name="Feature_aMap"/>
-		</list>
-	</class>
-	<class entity-name="Feature_aMap" lazy="false" table="`feature_amap`">
-		<meta attribute="featureMap">Feature</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`amap_name`"/>
-		</property>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
-			<column not-null="false" unique="false" name="`amap_value`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.MixedImpl" entity-name="Mixed" abstract="false" lazy="false" table="`mixed`">
-		<meta attribute="eclassName">Mixed</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="mixed" table="`mixed_mixed`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`mixed_mixed_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`mixed_mixed_idx`"/>
-			<one-to-many entity-name="Mixed_mixed"/>
-		</list>
-	</class>
-	<class entity-name="Mixed_mixed" lazy="false" table="`mixed_mixed`">
-		<meta attribute="featureMap">Mixed</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_name`"/>
-		</property>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
-			<column not-null="false" unique="false" name="`mixed_value`"/>
-		</property>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl.NameListImpl" entity-name="NameList" abstract="false" lazy="false" table="`namelist`">
-		<meta attribute="eclassName">NameList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/ecoreattrs</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="firstName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`firstname`"/>
-		</property>
-		<property name="middleName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`middlename`"/>
-		</property>
-		<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`lastname`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index f97598d3c..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
-		<param name="edatatype">USStateObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" discriminator-value="AddressList" table="`addresslist`">
-		<meta attribute="eclassName">AddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="addresslistdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<many-to-one name="firstAddress" entity-name="FirstAddressHolder" lazy="false" cascade="all" foreign-key="addresslist_firstaddress" insert="true" update="true" not-null="true" unique="true">
-			<column not-null="true" unique="false" name="`firstaddressholder_firstaddress_e_id`"/>
-		</many-to-one>
-		<list name="secondAddress" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="addresslist_secondaddress">
-				<column name="`addresslist_secondaddress_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`addresslist_secondaddress_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" discriminator-value="UKAddress">
-		<meta attribute="eclassName">UKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`postcode`"/>
-		</property>
-		<property name="exportCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`exportcode`"/>
-		</property>
-	</subclass>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" discriminator-value="DistrictUKAddress">
-		<meta attribute="eclassName">DistrictUKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`district`"/>
-		</property>
-	</subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl" entity-name="FirstAddressHolder" abstract="false" lazy="false" discriminator-value="FirstAddressHolder" table="`firstaddressholder`">
-		<meta attribute="eclassName">FirstAddressHolder</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="firstaddressholderdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="value" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="firstaddressholder_value">
-				<column name="`firstaddressholder_value_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`firstaddressholder_value_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" discriminator-value="InternationalPrice" table="`internationalprice`">
-		<meta attribute="eclassName">InternationalPrice</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="internationalpricedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
-			<column not-null="false" unique="false" name="`value`"/>
-		</property>
-		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`currency`"/>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress">
-		<meta attribute="eclassName">USAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`state`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.USState</param>
-				<param name="eclassifier">USState</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
-			</type>
-		</property>
-		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`zip`"/>
-		</property>
-	</subclass>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 8711fbfb4..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
-		<param name="edatatype">USStateObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" table="`addresslist`">
-		<meta attribute="eclassName">AddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<many-to-one name="firstAddress" entity-name="FirstAddressHolder" lazy="false" cascade="all" foreign-key="addresslist_firstaddress" insert="true" update="true" not-null="true" unique="true">
-			<column not-null="true" unique="false" name="`firstaddressholder_firstaddress_e_id`"/>
-		</many-to-one>
-		<list name="secondAddress" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="addresslist_secondaddress">
-				<column name="`addresslist_secondaddress_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`addresslist_secondaddress_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
-		<meta attribute="eclassName">UKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<key>
-			<column name="`address_e_id`"/>
-		</key>
-		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postcode`"/>
-		</property>
-		<property name="exportCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`exportcode`"/>
-		</property>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
-		<meta attribute="eclassName">DistrictUKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<key>
-			<column name="`ukaddress_e_id`"/>
-		</key>
-		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`district`"/>
-		</property>
-	</joined-subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl" entity-name="FirstAddressHolder" abstract="false" lazy="false" table="`firstaddressholder`">
-		<meta attribute="eclassName">FirstAddressHolder</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="value" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="firstaddressholder_value">
-				<column name="`firstaddressholder_value_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`firstaddressholder_value_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" table="`internationalprice`">
-		<meta attribute="eclassName">InternationalPrice</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
-			<column not-null="false" unique="false" name="`value`"/>
-		</property>
-		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`currency`"/>
-		</property>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
-		<meta attribute="eclassName">USAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<key>
-			<column name="`address_e_id`"/>
-		</key>
-		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`state`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.USState</param>
-				<param name="eclassifier">USState</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
-			</type>
-		</property>
-		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`zip`"/>
-		</property>
-	</joined-subclass>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 8711fbfb4..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ExtensionAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
-		<param name="edatatype">USStateObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" table="`addresslist`">
-		<meta attribute="eclassName">AddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<many-to-one name="firstAddress" entity-name="FirstAddressHolder" lazy="false" cascade="all" foreign-key="addresslist_firstaddress" insert="true" update="true" not-null="true" unique="true">
-			<column not-null="true" unique="false" name="`firstaddressholder_firstaddress_e_id`"/>
-		</many-to-one>
-		<list name="secondAddress" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="addresslist_secondaddress">
-				<column name="`addresslist_secondaddress_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`addresslist_secondaddress_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
-		<meta attribute="eclassName">UKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<key>
-			<column name="`address_e_id`"/>
-		</key>
-		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postcode`"/>
-		</property>
-		<property name="exportCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`exportcode`"/>
-		</property>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
-		<meta attribute="eclassName">DistrictUKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<key>
-			<column name="`ukaddress_e_id`"/>
-		</key>
-		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`district`"/>
-		</property>
-	</joined-subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.FirstAddressHolderImpl" entity-name="FirstAddressHolder" abstract="false" lazy="false" table="`firstaddressholder`">
-		<meta attribute="eclassName">FirstAddressHolder</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="value" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="firstaddressholder_value">
-				<column name="`firstaddressholder_value_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`firstaddressholder_value_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" table="`internationalprice`">
-		<meta attribute="eclassName">InternationalPrice</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
-			<column not-null="false" unique="false" name="`value`"/>
-		</property>
-		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`currency`"/>
-		</property>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
-		<meta attribute="eclassName">USAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</meta>
-		<key>
-			<column name="`address_e_id`"/>
-		</key>
-		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`state`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.USState</param>
-				<param name="eclassifier">USState</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/extension</param>
-			</type>
-		</property>
-		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`zip`"/>
-		</property>
-	</joined-subclass>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index d58b44b67..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="group" table="`address_group`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`address_group_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`address_group_idx`"/>
-			<one-to-many entity-name="Address_group"/>
-		</list>
-	</class>
-	<class entity-name="Address_group" lazy="false" table="`address_group`">
-		<meta attribute="featureMap">Address</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`group_name`"/>
-		</property>
-		<property name="longName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`group_longname`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressGroupImpl" entity-name="AddressGroup" abstract="false" lazy="false" discriminator-value="AddressGroup" table="`addressgroup`">
-		<meta attribute="eclassName">AddressGroup</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="addressgroupdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`groupname`"/>
-		</property>
-		<many-to-one name="shipTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addressgroup_shipto" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_shipto_e_id`"/>
-		</many-to-one>
-		<many-to-one name="billTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addressgroup_billto" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_billto_e_id`"/>
-		</many-to-one>
-		<property name="simpleAddress" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`simpleaddress`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" discriminator-value="AddressList" table="`addresslist`">
-		<meta attribute="eclassName">AddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="addresslistdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`groupname`"/>
-		</property>
-		<list name="addrs" table="`addresslist_addrs`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`addresslist_addrs_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`addresslist_addrs_idx`"/>
-			<one-to-many entity-name="AddressList_addrs"/>
-		</list>
-	</class>
-	<class entity-name="AddressList_addrs" lazy="false" table="`addresslist_addrs`">
-		<meta attribute="featureMap">AddressList</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="shipTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addresslist_shipto" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`addrs_address_shipto_e_id`"/>
-		</many-to-one>
-		<many-to-one name="billTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addresslist_billto" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`addrs_address_billto_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllMapTypeImpl" entity-name="SimpleAllMapType" abstract="false" lazy="false" discriminator-value="SimpleAllMapType" table="`simpleallmaptype`">
-		<meta attribute="eclassName">SimpleAllMapType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="simpleallmaptypedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="allMap" table="`simpleallmaptype_allmap`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simpleallmaptype_allmap_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`simpleallmaptype_allmap_idx`"/>
-			<one-to-many entity-name="SimpleAllMapType_allMap"/>
-		</list>
-	</class>
-	<class entity-name="SimpleAllMapType_allMap" lazy="false" table="`simpleallmaptype_allmap`">
-		<meta attribute="featureMap">SimpleAllMapType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="aaa" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`allmap_aaa`"/>
-		</property>
-		<property name="bbb" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`allmap_bbb`"/>
-		</property>
-		<property name="ccc" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`allmap_ccc`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllTypeImpl" entity-name="SimpleAllType" abstract="false" lazy="false" discriminator-value="SimpleAllType" table="`simplealltype`">
-		<meta attribute="eclassName">SimpleAllType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="simplealltypedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="aaa" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`aaa`"/>
-		</property>
-		<property name="bbb" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`bbb`"/>
-		</property>
-		<property name="ccc" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`ccc`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index edaa75805..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="group" table="`address_group`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`address_group_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`address_group_idx`"/>
-			<one-to-many entity-name="Address_group"/>
-		</list>
-	</class>
-	<class entity-name="Address_group" lazy="false" table="`address_group`">
-		<meta attribute="featureMap">Address</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`group_name`"/>
-		</property>
-		<property name="longName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`group_longname`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressGroupImpl" entity-name="AddressGroup" abstract="false" lazy="false" table="`addressgroup`">
-		<meta attribute="eclassName">AddressGroup</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`groupname`"/>
-		</property>
-		<many-to-one name="shipTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addressgroup_shipto" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_shipto_e_id`"/>
-		</many-to-one>
-		<many-to-one name="billTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addressgroup_billto" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_billto_e_id`"/>
-		</many-to-one>
-		<property name="simpleAddress" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`simpleaddress`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" table="`addresslist`">
-		<meta attribute="eclassName">AddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`groupname`"/>
-		</property>
-		<list name="addrs" table="`addresslist_addrs`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`addresslist_addrs_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`addresslist_addrs_idx`"/>
-			<one-to-many entity-name="AddressList_addrs"/>
-		</list>
-	</class>
-	<class entity-name="AddressList_addrs" lazy="false" table="`addresslist_addrs`">
-		<meta attribute="featureMap">AddressList</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="shipTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addresslist_shipto" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`addrs_address_shipto_e_id`"/>
-		</many-to-one>
-		<many-to-one name="billTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addresslist_billto" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`addrs_address_billto_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllMapTypeImpl" entity-name="SimpleAllMapType" abstract="false" lazy="false" table="`simpleallmaptype`">
-		<meta attribute="eclassName">SimpleAllMapType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="allMap" table="`simpleallmaptype_allmap`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simpleallmaptype_allmap_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`simpleallmaptype_allmap_idx`"/>
-			<one-to-many entity-name="SimpleAllMapType_allMap"/>
-		</list>
-	</class>
-	<class entity-name="SimpleAllMapType_allMap" lazy="false" table="`simpleallmaptype_allmap`">
-		<meta attribute="featureMap">SimpleAllMapType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="aaa" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`allmap_aaa`"/>
-		</property>
-		<property name="bbb" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`allmap_bbb`"/>
-		</property>
-		<property name="ccc" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`allmap_ccc`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllTypeImpl" entity-name="SimpleAllType" abstract="false" lazy="false" table="`simplealltype`">
-		<meta attribute="eclassName">SimpleAllType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="aaa" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`aaa`"/>
-		</property>
-		<property name="bbb" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`bbb`"/>
-		</property>
-		<property name="ccc" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`ccc`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index edaa75805..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/GroupAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="group" table="`address_group`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`address_group_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`address_group_idx`"/>
-			<one-to-many entity-name="Address_group"/>
-		</list>
-	</class>
-	<class entity-name="Address_group" lazy="false" table="`address_group`">
-		<meta attribute="featureMap">Address</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`group_name`"/>
-		</property>
-		<property name="longName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`group_longname`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressGroupImpl" entity-name="AddressGroup" abstract="false" lazy="false" table="`addressgroup`">
-		<meta attribute="eclassName">AddressGroup</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`groupname`"/>
-		</property>
-		<many-to-one name="shipTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addressgroup_shipto" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_shipto_e_id`"/>
-		</many-to-one>
-		<many-to-one name="billTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addressgroup_billto" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_billto_e_id`"/>
-		</many-to-one>
-		<property name="simpleAddress" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`simpleaddress`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.AddressListImpl" entity-name="AddressList" abstract="false" lazy="false" table="`addresslist`">
-		<meta attribute="eclassName">AddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="groupName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`groupname`"/>
-		</property>
-		<list name="addrs" table="`addresslist_addrs`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`addresslist_addrs_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`addresslist_addrs_idx`"/>
-			<one-to-many entity-name="AddressList_addrs"/>
-		</list>
-	</class>
-	<class entity-name="AddressList_addrs" lazy="false" table="`addresslist_addrs`">
-		<meta attribute="featureMap">AddressList</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="shipTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addresslist_shipto" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`addrs_address_shipto_e_id`"/>
-		</many-to-one>
-		<many-to-one name="billTo" entity-name="Address" lazy="false" cascade="all" foreign-key="addresslist_billto" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`addrs_address_billto_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllMapTypeImpl" entity-name="SimpleAllMapType" abstract="false" lazy="false" table="`simpleallmaptype`">
-		<meta attribute="eclassName">SimpleAllMapType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="allMap" table="`simpleallmaptype_allmap`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simpleallmaptype_allmap_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`simpleallmaptype_allmap_idx`"/>
-			<one-to-many entity-name="SimpleAllMapType_allMap"/>
-		</list>
-	</class>
-	<class entity-name="SimpleAllMapType_allMap" lazy="false" table="`simpleallmaptype_allmap`">
-		<meta attribute="featureMap">SimpleAllMapType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="aaa" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`allmap_aaa`"/>
-		</property>
-		<property name="bbb" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`allmap_bbb`"/>
-		</property>
-		<property name="ccc" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`allmap_ccc`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl.SimpleAllTypeImpl" entity-name="SimpleAllType" abstract="false" lazy="false" table="`simplealltype`">
-		<meta attribute="eclassName">SimpleAllType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/groupall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="aaa" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`aaa`"/>
-		</property>
-		<property name="bbb" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`bbb`"/>
-		</property>
-		<property name="ccc" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`ccc`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 77f9d10e4..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="list.SixStatesList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
-		<param name="edatatype">SixStatesList</param>
-	</typedef>
-	<typedef name="list.StateList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
-		<param name="edatatype">StateList</param>
-	</typedef>
-	<typedef name="list.StringList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
-		<param name="edatatype">StringList</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl.statesByCountryImpl" entity-name="statesByCountry" abstract="false" lazy="false" discriminator-value="statesByCountry" table="`statesbycountry`">
-		<meta attribute="eclassName">statesByCountry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="statesbycountrydtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="country" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`country`"/>
-		</property>
-		<property name="index" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`index`"/>
-		</property>
-		<property name="allStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.StateList">
-			<column not-null="true" unique="false" name="`allstates`"/>
-		</property>
-		<property name="sixImportantStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.SixStatesList">
-			<column not-null="true" unique="false" name="`siximportantstates`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 890e59a32..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="list.SixStatesList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
-		<param name="edatatype">SixStatesList</param>
-	</typedef>
-	<typedef name="list.StateList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
-		<param name="edatatype">StateList</param>
-	</typedef>
-	<typedef name="list.StringList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
-		<param name="edatatype">StringList</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl.statesByCountryImpl" entity-name="statesByCountry" abstract="false" lazy="false" table="`statesbycountry`">
-		<meta attribute="eclassName">statesByCountry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="country" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`country`"/>
-		</property>
-		<property name="index" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`index`"/>
-		</property>
-		<property name="allStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.StateList">
-			<column not-null="true" unique="false" name="`allstates`"/>
-		</property>
-		<property name="sixImportantStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.SixStatesList">
-			<column not-null="true" unique="false" name="`siximportantstates`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 890e59a32..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="list.SixStatesList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
-		<param name="edatatype">SixStatesList</param>
-	</typedef>
-	<typedef name="list.StateList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
-		<param name="edatatype">StateList</param>
-	</typedef>
-	<typedef name="list.StringList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param>
-		<param name="edatatype">StringList</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl.statesByCountryImpl" entity-name="statesByCountry" abstract="false" lazy="false" table="`statesbycountry`">
-		<meta attribute="eclassName">statesByCountry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="country" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`country`"/>
-		</property>
-		<property name="index" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`index`"/>
-		</property>
-		<property name="allStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.StateList">
-			<column not-null="true" unique="false" name="`allstates`"/>
-		</property>
-		<property name="sixImportantStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="list.SixStatesList">
-			<column not-null="true" unique="false" name="`siximportantstates`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListUnionAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListUnionAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 06e5c8476..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ListUnionAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="listunion.SixStatesList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/listunion</param>
-		<param name="edatatype">SixStatesList</param>
-	</typedef>
-	<typedef name="listunion.StateList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/listunion</param>
-		<param name="edatatype">StateList</param>
-	</typedef>
-	<typedef name="listunion.StringList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/listunion</param>
-		<param name="edatatype">StringList</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.impl.statesByCountryImpl" entity-name="statesByCountry" abstract="false" lazy="false" table="`statesbycountry`">
-		<meta attribute="eclassName">statesByCountry</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/listunion</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="country" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`country`"/>
-		</property>
-		<property name="allStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="listunion.StateList">
-			<column not-null="true" unique="false" name="`allstates`"/>
-		</property>
-		<property name="sixImportantStates" lazy="false" insert="true" update="true" not-null="true" unique="false" type="listunion.SixStatesList">
-			<column not-null="false" unique="false" name="`siximportantstates`"/>
-		</property>
-		<property name="zipUnion" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`zipunion`"/>
-		</property>
-		<list name="zipUnions" table="`statesbycountry_zipunions`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`statesbycountry_zipunions_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`statesbycountry_zipunions_idx`"/>
-			<element type="java.lang.String"/>
-		</list>
-		<property name="simpleUnion" lazy="false" insert="true" update="true" not-null="true" unique="false">
-			<column not-null="true" unique="false" name="`simpleunion`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-				<param name="edatatype">SimpleUnionType</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/listunion</param>
-			</type>
-		</property>
-		<list name="simpleUnions" table="`statesbycountry_simpleunions`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`statesbycountry_simpleunions_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`statesbycountry_simpleunions_idx`"/>
-			<element type="java.math.BigInteger,java.lang.String"/>
-		</list>
-		<property name="simpleStringUnion" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`simplestringunion`"/>
-		</property>
-		<list name="simpleStringUnions" table="`statesbycountry_simplestringunions`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`statesbycountry_simplestringunions_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`statesbycountry_simplestringunions_idx`"/>
-			<element type="java.lang.String"/>
-		</list>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index b567aea79..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.LetterBodyTypeImpl" entity-name="LetterBodyType" abstract="false" lazy="false" discriminator-value="LetterBodyType" table="`letterbodytype`">
-		<meta attribute="eclassName">LetterBodyType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/mixed</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="letterbodytypedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="mixed" table="`letterbodytype_mixed`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`letterbodytype_mixed_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`letterbodytype_mixed_idx`"/>
-			<one-to-many entity-name="LetterBodyType_mixed"/>
-		</list>
-	</class>
-	<class entity-name="LetterBodyType_mixed" lazy="false" table="`letterbodytype_mixed`">
-		<meta attribute="featureMap">LetterBodyType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="salutation" entity-name="SalutationType" lazy="false" cascade="all" foreign-key="letterbodytype_salutation" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mixed_salutationtype_salutation_e_id`"/>
-		</many-to-one>
-		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`mixed_quantity`"/>
-		</property>
-		<property name="productName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_productname`"/>
-		</property>
-		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
-			<column not-null="false" unique="false" name="`mixed_shipdate`"/>
-		</property>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.SalutationTypeImpl" entity-name="SalutationType" abstract="false" lazy="false" discriminator-value="SalutationType" table="`salutationtype`">
-		<meta attribute="eclassName">SalutationType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/mixed</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="salutationtypedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="mixed" table="`salutationtype_mixed`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`salutationtype_mixed_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`salutationtype_mixed_idx`"/>
-			<one-to-many entity-name="SalutationType_mixed"/>
-		</list>
-	</class>
-	<class entity-name="SalutationType_mixed" lazy="false" table="`salutationtype_mixed`">
-		<meta attribute="featureMap">SalutationType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_name`"/>
-		</property>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 70d555973..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.LetterBodyTypeImpl" entity-name="LetterBodyType" abstract="false" lazy="false" table="`letterbodytype`">
-		<meta attribute="eclassName">LetterBodyType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/mixed</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="mixed" table="`letterbodytype_mixed`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`letterbodytype_mixed_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`letterbodytype_mixed_idx`"/>
-			<one-to-many entity-name="LetterBodyType_mixed"/>
-		</list>
-	</class>
-	<class entity-name="LetterBodyType_mixed" lazy="false" table="`letterbodytype_mixed`">
-		<meta attribute="featureMap">LetterBodyType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="salutation" entity-name="SalutationType" lazy="false" cascade="all" foreign-key="letterbodytype_salutation" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mixed_salutationtype_salutation_e_id`"/>
-		</many-to-one>
-		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`mixed_quantity`"/>
-		</property>
-		<property name="productName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_productname`"/>
-		</property>
-		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
-			<column not-null="false" unique="false" name="`mixed_shipdate`"/>
-		</property>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.SalutationTypeImpl" entity-name="SalutationType" abstract="false" lazy="false" table="`salutationtype`">
-		<meta attribute="eclassName">SalutationType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/mixed</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="mixed" table="`salutationtype_mixed`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`salutationtype_mixed_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`salutationtype_mixed_idx`"/>
-			<one-to-many entity-name="SalutationType_mixed"/>
-		</list>
-	</class>
-	<class entity-name="SalutationType_mixed" lazy="false" table="`salutationtype_mixed`">
-		<meta attribute="featureMap">SalutationType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_name`"/>
-		</property>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 70d555973..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/MixedAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.LetterBodyTypeImpl" entity-name="LetterBodyType" abstract="false" lazy="false" table="`letterbodytype`">
-		<meta attribute="eclassName">LetterBodyType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/mixed</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="mixed" table="`letterbodytype_mixed`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`letterbodytype_mixed_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`letterbodytype_mixed_idx`"/>
-			<one-to-many entity-name="LetterBodyType_mixed"/>
-		</list>
-	</class>
-	<class entity-name="LetterBodyType_mixed" lazy="false" table="`letterbodytype_mixed`">
-		<meta attribute="featureMap">LetterBodyType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="salutation" entity-name="SalutationType" lazy="false" cascade="all" foreign-key="letterbodytype_salutation" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mixed_salutationtype_salutation_e_id`"/>
-		</many-to-one>
-		<property name="quantity" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`mixed_quantity`"/>
-		</property>
-		<property name="productName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_productname`"/>
-		</property>
-		<property name="shipDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
-			<column not-null="false" unique="false" name="`mixed_shipdate`"/>
-		</property>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl.SalutationTypeImpl" entity-name="SalutationType" abstract="false" lazy="false" table="`salutationtype`">
-		<meta attribute="eclassName">SalutationType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/mixed</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="mixed" table="`salutationtype_mixed`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`salutationtype_mixed_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`salutationtype_mixed_idx`"/>
-			<one-to-many entity-name="SalutationType_mixed"/>
-		</list>
-	</class>
-	<class entity-name="SalutationType_mixed" lazy="false" table="`salutationtype_mixed`">
-		<meta attribute="featureMap">SalutationType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_name`"/>
-		</property>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ModelGroupAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ModelGroupAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index bef803834..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/ModelGroupAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.modelgroup.impl.OrderListImpl" entity-name="OrderList" abstract="false" lazy="false" table="`orderlist`">
-		<meta attribute="eclassName">OrderList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/modelgroup</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="orders" table="`orderlist_orders`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`orderlist_orders_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`orderlist_orders_idx`"/>
-			<one-to-many entity-name="OrderList_orders"/>
-		</list>
-	</class>
-	<class entity-name="OrderList_orders" lazy="false" table="`orderlist_orders`">
-		<meta attribute="featureMap">OrderList</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="preferredOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="orderlist_preferredorders" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`orders_purchaseorder_preferredorders_e_id`"/>
-		</many-to-one>
-		<many-to-one name="standardOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="orderlist_standardorders" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`orders_purchaseorder_standardorders_e_id`"/>
-		</many-to-one>
-		<property name="hardCopyOrderReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`orders_hardcopyorderreference`"/>
-		</property>
-		<property name="hardCopyOrderNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
-			<column not-null="false" unique="false" name="`orders_hardcopyordernumber`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.modelgroup.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`">
-		<meta attribute="eclassName">PurchaseOrder</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/modelgroup</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="reference" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`reference`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index b1401c955..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.AImpl" entity-name="A" abstract="false" lazy="false" discriminator-value="A" table="`a`">
-		<meta attribute="eclassName">A</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="adtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="group" table="`a_group`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`a_group_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`a_group_idx`"/>
-			<one-to-many entity-name="A_group"/>
-		</list>
-	</class>
-	<class entity-name="A_group" lazy="false" table="`a_group`">
-		<meta attribute="featureMap">A</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="b" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`group_b`"/>
-		</property>
-		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="a_c" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`group_ctype_c_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.CTypeImpl" entity-name="CType" abstract="false" lazy="false" discriminator-value="CType" table="`ctype`">
-		<meta attribute="eclassName">CType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="ctypedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="cname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`cname`"/>
-		</property>
-		<property name="cvalue" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
-			<column not-null="false" unique="false" name="`cvalue`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" discriminator-value="Element" table="`element`">
-		<meta attribute="eclassName">Element</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="elementdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="mixed" table="`element_mixed`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`element_mixed_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`element_mixed_idx`"/>
-			<one-to-many entity-name="Element_mixed"/>
-		</list>
-	</class>
-	<class entity-name="Element_mixed" lazy="false" table="`element_mixed`">
-		<meta attribute="featureMap">Element</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_name`"/>
-		</property>
-		<list name="true" table="`mixed_element_true`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`mixed_element_true_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`mixed_element_true_idx`"/>
-			<one-to-many entity-name="Element_true"/>
-		</list>
-		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="element_c" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mixed_ctype_c_e_id`"/>
-		</many-to-one>
-		<many-to-one name="recursive" entity-name="Element" lazy="false" cascade="all" foreign-key="element_recursive" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mixed_element_recursive_e_id`"/>
-		</many-to-one>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-	<class entity-name="Element_true" lazy="false" table="`element_true`">
-		<meta attribute="featureMap">Element</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="element_c" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`true_ctype_c_e_id`"/>
-		</many-to-one>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index b1a3153ea..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.AImpl" entity-name="A" abstract="false" lazy="false" table="`a`">
-		<meta attribute="eclassName">A</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="group" table="`a_group`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`a_group_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`a_group_idx`"/>
-			<one-to-many entity-name="A_group"/>
-		</list>
-	</class>
-	<class entity-name="A_group" lazy="false" table="`a_group`">
-		<meta attribute="featureMap">A</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="b" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`group_b`"/>
-		</property>
-		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="a_c" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`group_ctype_c_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.CTypeImpl" entity-name="CType" abstract="false" lazy="false" table="`ctype`">
-		<meta attribute="eclassName">CType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="cname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`cname`"/>
-		</property>
-		<property name="cvalue" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
-			<column not-null="false" unique="false" name="`cvalue`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" table="`element`">
-		<meta attribute="eclassName">Element</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="mixed" table="`element_mixed`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`element_mixed_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`element_mixed_idx`"/>
-			<one-to-many entity-name="Element_mixed"/>
-		</list>
-	</class>
-	<class entity-name="Element_mixed" lazy="false" table="`element_mixed`">
-		<meta attribute="featureMap">Element</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_name`"/>
-		</property>
-		<list name="true" table="`mixed_element_true`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`mixed_element_true_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`mixed_element_true_idx`"/>
-			<one-to-many entity-name="Element_true"/>
-		</list>
-		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="element_c" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mixed_ctype_c_e_id`"/>
-		</many-to-one>
-		<many-to-one name="recursive" entity-name="Element" lazy="false" cascade="all" foreign-key="element_recursive" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mixed_element_recursive_e_id`"/>
-		</many-to-one>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-	<class entity-name="Element_true" lazy="false" table="`element_true`">
-		<meta attribute="featureMap">Element</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="element_c" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`true_ctype_c_e_id`"/>
-		</many-to-one>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index b1a3153ea..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/NestedGroupAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.AImpl" entity-name="A" abstract="false" lazy="false" table="`a`">
-		<meta attribute="eclassName">A</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="group" table="`a_group`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`a_group_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`a_group_idx`"/>
-			<one-to-many entity-name="A_group"/>
-		</list>
-	</class>
-	<class entity-name="A_group" lazy="false" table="`a_group`">
-		<meta attribute="featureMap">A</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="b" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`group_b`"/>
-		</property>
-		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="a_c" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`group_ctype_c_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.CTypeImpl" entity-name="CType" abstract="false" lazy="false" table="`ctype`">
-		<meta attribute="eclassName">CType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="cname" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`cname`"/>
-		</property>
-		<property name="cvalue" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
-			<column not-null="false" unique="false" name="`cvalue`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl.ElementImpl" entity-name="Element" abstract="false" lazy="false" table="`element`">
-		<meta attribute="eclassName">Element</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/nestedgroup</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="mixed" table="`element_mixed`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`element_mixed_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`element_mixed_idx`"/>
-			<one-to-many entity-name="Element_mixed"/>
-		</list>
-	</class>
-	<class entity-name="Element_mixed" lazy="false" table="`element_mixed`">
-		<meta attribute="featureMap">Element</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mixed_name`"/>
-		</property>
-		<list name="true" table="`mixed_element_true`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`mixed_element_true_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`mixed_element_true_idx`"/>
-			<one-to-many entity-name="Element_true"/>
-		</list>
-		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="element_c" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mixed_ctype_c_e_id`"/>
-		</many-to-one>
-		<many-to-one name="recursive" entity-name="Element" lazy="false" cascade="all" foreign-key="element_recursive" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mixed_element_recursive_e_id`"/>
-		</many-to-one>
-		<property name="fme_mixed_text" type="java.lang.String"/>
-		<property name="fme_mixed_cdata" type="java.lang.String"/>
-		<property name="fme_mixed_comment" type="java.lang.String"/>
-	</class>
-	<class entity-name="Element_true" lazy="false" table="`element_true`">
-		<meta attribute="featureMap">Element</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="c" entity-name="CType" lazy="false" cascade="all" foreign-key="element_c" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`true_ctype_c_e_id`"/>
-		</many-to-one>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index ca820900f..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.impl.MytestImpl" entity-name="Mytest" abstract="false" lazy="false" discriminator-value="Mytest" table="`mytest`">
-		<meta attribute="eclassName">Mytest</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/qname</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="mytestdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`description`"/>
-		</property>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.QNameUserType">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="names" table="`mytest_names`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`mytest_names_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`mytest_names_idx`"/>
-			<element type="org.eclipse.emf.teneo.hibernate.mapping.QNameUserType"/>
-		</list>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 9ae61854b..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.impl.MytestImpl" entity-name="Mytest" abstract="false" lazy="false" table="`mytest`">
-		<meta attribute="eclassName">Mytest</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/qname</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`description`"/>
-		</property>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.QNameUserType">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="names" table="`mytest_names`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`mytest_names_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`mytest_names_idx`"/>
-			<element type="org.eclipse.emf.teneo.hibernate.mapping.QNameUserType"/>
-		</list>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 9ae61854b..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/QNameAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.impl.MytestImpl" entity-name="Mytest" abstract="false" lazy="false" table="`mytest`">
-		<meta attribute="eclassName">Mytest</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/qname</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="description" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`description`"/>
-		</property>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.QNameUserType">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="names" table="`mytest_names`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`mytest_names_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`mytest_names_idx`"/>
-			<element type="org.eclipse.emf.teneo.hibernate.mapping.QNameUserType"/>
-		</list>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index f24483672..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl.XMLDeviantImpl" entity-name="XMLDeviant" abstract="false" lazy="false" discriminator-value="XMLDeviant" table="`xmldeviant`">
-		<meta attribute="eclassName">XMLDeviant</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/restriction</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="xmldeviantdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="numPosts" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`numposts`"/>
-		</property>
-		<property name="signature" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`signature`"/>
-		</property>
-		<property name="email" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`email`"/>
-		</property>
-		<property name="firstSubscribed" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
-			<column not-null="false" unique="false" name="`firstsubscribed`"/>
-		</property>
-		<property name="mailReader" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mailreader`"/>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl.MemberImpl" entity-name="Member" abstract="false" lazy="false" extends="XMLDeviant" discriminator-value="Member">
-		<meta attribute="eclassName">Member</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/restriction</meta>
-	</subclass>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 89e62c9c3..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl.XMLDeviantImpl" entity-name="XMLDeviant" abstract="false" lazy="false" table="`xmldeviant`">
-		<meta attribute="eclassName">XMLDeviant</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/restriction</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="numPosts" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`numposts`"/>
-		</property>
-		<property name="signature" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`signature`"/>
-		</property>
-		<property name="email" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`email`"/>
-		</property>
-		<property name="firstSubscribed" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
-			<column not-null="false" unique="false" name="`firstsubscribed`"/>
-		</property>
-		<property name="mailReader" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mailreader`"/>
-		</property>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl.MemberImpl" entity-name="Member" abstract="false" lazy="false" extends="XMLDeviant" table="`member`">
-		<meta attribute="eclassName">Member</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/restriction</meta>
-		<key>
-			<column name="`xmldeviant_e_id`"/>
-		</key>
-	</joined-subclass>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 89e62c9c3..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/RestrictionAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl.XMLDeviantImpl" entity-name="XMLDeviant" abstract="false" lazy="false" table="`xmldeviant`">
-		<meta attribute="eclassName">XMLDeviant</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/restriction</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="numPosts" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`numposts`"/>
-		</property>
-		<property name="signature" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`signature`"/>
-		</property>
-		<property name="email" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`email`"/>
-		</property>
-		<property name="firstSubscribed" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
-			<column not-null="false" unique="false" name="`firstsubscribed`"/>
-		</property>
-		<property name="mailReader" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`mailreader`"/>
-		</property>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl.MemberImpl" entity-name="Member" abstract="false" lazy="false" extends="XMLDeviant" table="`member`">
-		<meta attribute="eclassName">Member</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/restriction</meta>
-		<key>
-			<column name="`xmldeviant_e_id`"/>
-		</key>
-	</joined-subclass>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index fab726101..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">SimpleEnumObject</param>
-	</typedef>
-	<typedef name="simpletypes.StringArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">StringArray</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleListImpl" entity-name="SimpleList" abstract="false" lazy="false" discriminator-value="SimpleList" table="`simplelist`">
-		<meta attribute="eclassName">SimpleList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="simplelistdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`code`"/>
-		</property>
-		<list name="boo" table="`simplelist_boo`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_boo_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_boo_idx`"/>
-			<element type="boolean"/>
-		</list>
-		<list name="byt" table="`simplelist_byt`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_byt_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_byt_idx`"/>
-			<element type="java.lang.Byte"/>
-		</list>
-		<list name="doubl" table="`simplelist_doubl`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_doubl_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_doubl_idx`"/>
-			<element type="java.lang.Double"/>
-		</list>
-		<list name="floa" table="`simplelist_floa`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_floa_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_floa_idx`"/>
-			<element type="java.lang.Float"/>
-		</list>
-		<list name="inte" table="`simplelist_inte`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_inte_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_inte_idx`"/>
-			<element type="java.lang.Integer"/>
-		</list>
-		<list name="long" table="`longnum`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_long_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_long_idx`"/>
-			<element type="java.lang.Long"/>
-		</list>
-		<list name="shor" table="`simplelist_shor`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_shor_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_shor_idx`"/>
-			<element type="short"/>
-		</list>
-		<list name="enu" table="`simplelist_enu`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_enu_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_enu_idx`"/>
-			<element>
-				<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-					<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
-					<param name="eclassifier">SimpleEnum</param>
-					<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-				</type>
-			</element>
-		</list>
-		<list name="dat" table="`simplelist_dat`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_dat_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_dat_idx`"/>
-			<element type="timestamp"/>
-		</list>
-		<list name="limitedstring" table="`simplelist_limitedstring`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_limitedstring_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_limitedstring_idx`"/>
-			<element type="java.lang.String"/>
-		</list>
-		<list name="stri" table="`simplelist_stri`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_stri_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_stri_idx`"/>
-			<element type="java.lang.String"/>
-		</list>
-		<array name="intArray" table="`simplelist_intarray`" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_intarray_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_intarray_idx`"/>
-			<element type="int"/>
-		</array>
-		<array name="doubleArray" table="`simplelist_doublearray`" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_doublearray_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_doublearray_idx`"/>
-			<element type="double"/>
-		</array>
-		<property name="stringArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.StringArray">
-			<column not-null="true" unique="false" name="`stringarray`"/>
-		</property>
-		<array name="byteArray" table="`simplelist_bytearray`" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_bytearray_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_bytearray_idx`"/>
-			<element type="byte"/>
-		</array>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeImpl" entity-name="SimpleType" abstract="false" lazy="false" discriminator-value="SimpleType" table="`simpletype`">
-		<meta attribute="eclassName">SimpleType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="simpletypedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`code`"/>
-		</property>
-		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
-			<column not-null="false" unique="false" name="`boo`"/>
-		</property>
-		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
-			<column not-null="false" unique="false" name="`byt`"/>
-		</property>
-		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
-			<column not-null="false" unique="false" name="`doubl`"/>
-		</property>
-		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
-			<column not-null="false" unique="false" name="`float`"/>
-		</property>
-		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`inte`"/>
-		</property>
-		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
-			<column not-null="false" unique="false" name="`lon`"/>
-		</property>
-		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="short">
-			<column not-null="false" unique="false" name="`shor`"/>
-		</property>
-		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`enu`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
-				<param name="eclassifier">SimpleEnum</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-			</type>
-		</property>
-		<property name="dat" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
-			<column not-null="true" unique="false" name="`dat`"/>
-		</property>
-		<property name="limitedstring" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`limitedstring`" length="10"/>
-		</property>
-		<property name="limitedDecimal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
-			<column not-null="false" unique="false" name="`limiteddecimal`" precision="4" scale="1"/>
-		</property>
-		<property name="extraLimitedString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`extralimitedstring`" length="5"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeObjectImpl" entity-name="SimpleTypeObject" abstract="false" lazy="false" discriminator-value="SimpleTypeObject" table="`simpletypeobject`">
-		<meta attribute="eclassName">SimpleTypeObject</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="simpletypeobjectdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`code`"/>
-		</property>
-		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
-			<column not-null="false" unique="false" name="`boo`"/>
-		</property>
-		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Byte">
-			<column not-null="false" unique="false" name="`byt`"/>
-		</property>
-		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Double">
-			<column not-null="false" unique="false" name="`doubl`"/>
-		</property>
-		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Float">
-			<column not-null="false" unique="false" name="`float`"/>
-		</property>
-		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Integer">
-			<column not-null="false" unique="false" name="`inte`"/>
-		</property>
-		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Long">
-			<column not-null="false" unique="false" name="`lon`"/>
-		</property>
-		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Short">
-			<column not-null="false" unique="false" name="`shor`"/>
-		</property>
-		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false" type="simpletypes.SimpleEnumObject">
-			<column not-null="false" unique="false" name="`enu`"/>
-		</property>
-		<property name="dat" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
-			<column not-null="false" unique="false" name="`dat`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index ea7280f12..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">SimpleEnumObject</param>
-	</typedef>
-	<typedef name="simpletypes.StringArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">StringArray</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleListImpl" entity-name="SimpleList" abstract="false" lazy="false" table="`simplelist`">
-		<meta attribute="eclassName">SimpleList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`code`"/>
-		</property>
-		<list name="boo" table="`simplelist_boo`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_boo_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_boo_idx`"/>
-			<element type="boolean"/>
-		</list>
-		<list name="byt" table="`simplelist_byt`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_byt_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_byt_idx`"/>
-			<element type="java.lang.Byte"/>
-		</list>
-		<list name="doubl" table="`simplelist_doubl`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_doubl_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_doubl_idx`"/>
-			<element type="java.lang.Double"/>
-		</list>
-		<list name="floa" table="`simplelist_floa`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_floa_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_floa_idx`"/>
-			<element type="java.lang.Float"/>
-		</list>
-		<list name="inte" table="`simplelist_inte`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_inte_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_inte_idx`"/>
-			<element type="java.lang.Integer"/>
-		</list>
-		<list name="long" table="`longnum`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_long_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_long_idx`"/>
-			<element type="java.lang.Long"/>
-		</list>
-		<list name="shor" table="`simplelist_shor`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_shor_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_shor_idx`"/>
-			<element type="short"/>
-		</list>
-		<list name="enu" table="`simplelist_enu`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_enu_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_enu_idx`"/>
-			<element>
-				<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-					<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
-					<param name="eclassifier">SimpleEnum</param>
-					<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-				</type>
-			</element>
-		</list>
-		<list name="dat" table="`simplelist_dat`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_dat_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_dat_idx`"/>
-			<element type="timestamp"/>
-		</list>
-		<list name="limitedstring" table="`simplelist_limitedstring`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_limitedstring_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_limitedstring_idx`"/>
-			<element type="java.lang.String"/>
-		</list>
-		<list name="stri" table="`simplelist_stri`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_stri_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_stri_idx`"/>
-			<element type="java.lang.String"/>
-		</list>
-		<array name="intArray" table="`simplelist_intarray`" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_intarray_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_intarray_idx`"/>
-			<element type="int"/>
-		</array>
-		<array name="doubleArray" table="`simplelist_doublearray`" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_doublearray_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_doublearray_idx`"/>
-			<element type="double"/>
-		</array>
-		<property name="stringArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.StringArray">
-			<column not-null="true" unique="false" name="`stringarray`"/>
-		</property>
-		<array name="byteArray" table="`simplelist_bytearray`" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_bytearray_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_bytearray_idx`"/>
-			<element type="byte"/>
-		</array>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeImpl" entity-name="SimpleType" abstract="false" lazy="false" table="`simpletype`">
-		<meta attribute="eclassName">SimpleType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`code`"/>
-		</property>
-		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
-			<column not-null="false" unique="false" name="`boo`"/>
-		</property>
-		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
-			<column not-null="false" unique="false" name="`byt`"/>
-		</property>
-		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
-			<column not-null="false" unique="false" name="`doubl`"/>
-		</property>
-		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
-			<column not-null="false" unique="false" name="`float`"/>
-		</property>
-		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`inte`"/>
-		</property>
-		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
-			<column not-null="false" unique="false" name="`lon`"/>
-		</property>
-		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="short">
-			<column not-null="false" unique="false" name="`shor`"/>
-		</property>
-		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`enu`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
-				<param name="eclassifier">SimpleEnum</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-			</type>
-		</property>
-		<property name="dat" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
-			<column not-null="true" unique="false" name="`dat`"/>
-		</property>
-		<property name="limitedstring" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`limitedstring`" length="10"/>
-		</property>
-		<property name="limitedDecimal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
-			<column not-null="false" unique="false" name="`limiteddecimal`" precision="4" scale="1"/>
-		</property>
-		<property name="extraLimitedString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`extralimitedstring`" length="5"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeObjectImpl" entity-name="SimpleTypeObject" abstract="false" lazy="false" table="`simpletypeobject`">
-		<meta attribute="eclassName">SimpleTypeObject</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`code`"/>
-		</property>
-		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
-			<column not-null="false" unique="false" name="`boo`"/>
-		</property>
-		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Byte">
-			<column not-null="false" unique="false" name="`byt`"/>
-		</property>
-		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Double">
-			<column not-null="false" unique="false" name="`doubl`"/>
-		</property>
-		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Float">
-			<column not-null="false" unique="false" name="`float`"/>
-		</property>
-		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Integer">
-			<column not-null="false" unique="false" name="`inte`"/>
-		</property>
-		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Long">
-			<column not-null="false" unique="false" name="`lon`"/>
-		</property>
-		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Short">
-			<column not-null="false" unique="false" name="`shor`"/>
-		</property>
-		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false" type="simpletypes.SimpleEnumObject">
-			<column not-null="false" unique="false" name="`enu`"/>
-		</property>
-		<property name="dat" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
-			<column not-null="false" unique="false" name="`dat`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index ea7280f12..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">SimpleEnumObject</param>
-	</typedef>
-	<typedef name="simpletypes.StringArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">StringArray</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleListImpl" entity-name="SimpleList" abstract="false" lazy="false" table="`simplelist`">
-		<meta attribute="eclassName">SimpleList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`code`"/>
-		</property>
-		<list name="boo" table="`simplelist_boo`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_boo_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_boo_idx`"/>
-			<element type="boolean"/>
-		</list>
-		<list name="byt" table="`simplelist_byt`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_byt_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_byt_idx`"/>
-			<element type="java.lang.Byte"/>
-		</list>
-		<list name="doubl" table="`simplelist_doubl`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_doubl_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_doubl_idx`"/>
-			<element type="java.lang.Double"/>
-		</list>
-		<list name="floa" table="`simplelist_floa`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_floa_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_floa_idx`"/>
-			<element type="java.lang.Float"/>
-		</list>
-		<list name="inte" table="`simplelist_inte`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_inte_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_inte_idx`"/>
-			<element type="java.lang.Integer"/>
-		</list>
-		<list name="long" table="`longnum`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_long_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_long_idx`"/>
-			<element type="java.lang.Long"/>
-		</list>
-		<list name="shor" table="`simplelist_shor`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_shor_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_shor_idx`"/>
-			<element type="short"/>
-		</list>
-		<list name="enu" table="`simplelist_enu`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_enu_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_enu_idx`"/>
-			<element>
-				<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-					<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
-					<param name="eclassifier">SimpleEnum</param>
-					<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-				</type>
-			</element>
-		</list>
-		<list name="dat" table="`simplelist_dat`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_dat_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_dat_idx`"/>
-			<element type="timestamp"/>
-		</list>
-		<list name="limitedstring" table="`simplelist_limitedstring`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_limitedstring_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_limitedstring_idx`"/>
-			<element type="java.lang.String"/>
-		</list>
-		<list name="stri" table="`simplelist_stri`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_stri_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_stri_idx`"/>
-			<element type="java.lang.String"/>
-		</list>
-		<array name="intArray" table="`simplelist_intarray`" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_intarray_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_intarray_idx`"/>
-			<element type="int"/>
-		</array>
-		<array name="doubleArray" table="`simplelist_doublearray`" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_doublearray_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_doublearray_idx`"/>
-			<element type="double"/>
-		</array>
-		<property name="stringArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.StringArray">
-			<column not-null="true" unique="false" name="`stringarray`"/>
-		</property>
-		<array name="byteArray" table="`simplelist_bytearray`" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`simplelist_bytearray_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`simplelist_bytearray_idx`"/>
-			<element type="byte"/>
-		</array>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeImpl" entity-name="SimpleType" abstract="false" lazy="false" table="`simpletype`">
-		<meta attribute="eclassName">SimpleType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`code`"/>
-		</property>
-		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
-			<column not-null="false" unique="false" name="`boo`"/>
-		</property>
-		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="byte">
-			<column not-null="false" unique="false" name="`byt`"/>
-		</property>
-		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="double">
-			<column not-null="false" unique="false" name="`doubl`"/>
-		</property>
-		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
-			<column not-null="false" unique="false" name="`float`"/>
-		</property>
-		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`inte`"/>
-		</property>
-		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
-			<column not-null="false" unique="false" name="`lon`"/>
-		</property>
-		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="short">
-			<column not-null="false" unique="false" name="`shor`"/>
-		</property>
-		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`enu`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param>
-				<param name="eclassifier">SimpleEnum</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-			</type>
-		</property>
-		<property name="dat" lazy="false" insert="true" update="true" not-null="true" unique="false" type="timestamp">
-			<column not-null="true" unique="false" name="`dat`"/>
-		</property>
-		<property name="limitedstring" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`limitedstring`" length="10"/>
-		</property>
-		<property name="limitedDecimal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
-			<column not-null="false" unique="false" name="`limiteddecimal`" precision="4" scale="1"/>
-		</property>
-		<property name="extraLimitedString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`extralimitedstring`" length="5"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeObjectImpl" entity-name="SimpleTypeObject" abstract="false" lazy="false" table="`simpletypeobject`">
-		<meta attribute="eclassName">SimpleTypeObject</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`code`"/>
-		</property>
-		<property name="boo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Boolean">
-			<column not-null="false" unique="false" name="`boo`"/>
-		</property>
-		<property name="byt" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Byte">
-			<column not-null="false" unique="false" name="`byt`"/>
-		</property>
-		<property name="doubl" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Double">
-			<column not-null="false" unique="false" name="`doubl`"/>
-		</property>
-		<property name="float" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Float">
-			<column not-null="false" unique="false" name="`float`"/>
-		</property>
-		<property name="inte" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Integer">
-			<column not-null="false" unique="false" name="`inte`"/>
-		</property>
-		<property name="lon" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Long">
-			<column not-null="false" unique="false" name="`lon`"/>
-		</property>
-		<property name="shor" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.Short">
-			<column not-null="false" unique="false" name="`shor`"/>
-		</property>
-		<property name="enu" lazy="false" not-null="false" insert="true" update="true" unique="false" type="simpletypes.SimpleEnumObject">
-			<column not-null="false" unique="false" name="`enu`"/>
-		</property>
-		<property name="dat" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
-			<column not-null="false" unique="false" name="`dat`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 39dbe7b5e..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" discriminator-value="PurchaseOrder" table="`purchaseorder`">
-		<meta attribute="eclassName">PurchaseOrder</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/simplefeaturemap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="purchaseorderdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.SupplierImpl" entity-name="Supplier" abstract="false" lazy="false" discriminator-value="Supplier" table="`supplier`">
-		<meta attribute="eclassName">Supplier</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/simplefeaturemap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="supplierdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="orders" table="`supplier_orders`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`supplier_orders_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`supplier_orders_idx`"/>
-			<one-to-many entity-name="Supplier_orders"/>
-		</list>
-	</class>
-	<class entity-name="Supplier_orders" lazy="false" table="`supplier_orders`">
-		<meta attribute="featureMap">Supplier</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="preferredOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="supplier_preferredorders" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`orders_purchaseorder_preferredorders_e_id`"/>
-		</many-to-one>
-		<many-to-one name="standardOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="supplier_standardorders" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`orders_purchaseorder_standardorders_e_id`"/>
-		</many-to-one>
-		<property name="hardCopyOrderReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`orders_hardcopyorderreference`"/>
-		</property>
-		<property name="hardCopyOrderNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
-			<column not-null="false" unique="false" name="`orders_hardcopyordernumber`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index e855677d5..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`">
-		<meta attribute="eclassName">PurchaseOrder</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/simplefeaturemap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.SupplierImpl" entity-name="Supplier" abstract="false" lazy="false" table="`supplier`">
-		<meta attribute="eclassName">Supplier</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/simplefeaturemap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="orders" table="`supplier_orders`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`supplier_orders_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`supplier_orders_idx`"/>
-			<one-to-many entity-name="Supplier_orders"/>
-		</list>
-	</class>
-	<class entity-name="Supplier_orders" lazy="false" table="`supplier_orders`">
-		<meta attribute="featureMap">Supplier</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="preferredOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="supplier_preferredorders" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`orders_purchaseorder_preferredorders_e_id`"/>
-		</many-to-one>
-		<many-to-one name="standardOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="supplier_standardorders" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`orders_purchaseorder_standardorders_e_id`"/>
-		</many-to-one>
-		<property name="hardCopyOrderReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`orders_hardcopyorderreference`"/>
-		</property>
-		<property name="hardCopyOrderNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
-			<column not-null="false" unique="false" name="`orders_hardcopyordernumber`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index e855677d5..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimplefeaturemapAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.PurchaseOrderImpl" entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`">
-		<meta attribute="eclassName">PurchaseOrder</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/simplefeaturemap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl.SupplierImpl" entity-name="Supplier" abstract="false" lazy="false" table="`supplier`">
-		<meta attribute="eclassName">Supplier</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/simplefeaturemap</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="orders" table="`supplier_orders`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`supplier_orders_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`supplier_orders_idx`"/>
-			<one-to-many entity-name="Supplier_orders"/>
-		</list>
-	</class>
-	<class entity-name="Supplier_orders" lazy="false" table="`supplier_orders`">
-		<meta attribute="featureMap">Supplier</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="preferredOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="supplier_preferredorders" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`orders_purchaseorder_preferredorders_e_id`"/>
-		</many-to-one>
-		<many-to-one name="standardOrders" entity-name="PurchaseOrder" lazy="false" cascade="all" foreign-key="supplier_standardorders" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`orders_purchaseorder_standardorders_e_id`"/>
-		</many-to-one>
-		<property name="hardCopyOrderReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`orders_hardcopyorderreference`"/>
-		</property>
-		<property name="hardCopyOrderNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
-			<column not-null="false" unique="false" name="`orders_hardcopyordernumber`"/>
-		</property>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 9980b3a99..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.ComplexNumberImpl" entity-name="ComplexNumber" abstract="false" lazy="false" discriminator-value="ComplexNumber" table="`complexnumber`">
-		<meta attribute="eclassName">ComplexNumber</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="complexnumberdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
-			<column not-null="true" unique="false" name="`value`"/>
-		</property>
-		<property name="unit" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`unit`"/>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.EvenComplexNumberTypeImpl" entity-name="EvenComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" discriminator-value="EvenComplexNumberType">
-		<meta attribute="eclassName">EvenComplexNumberType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
-	</subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.MultiNumberTypeImpl" entity-name="MultiNumberType" abstract="false" lazy="false" discriminator-value="MultiNumberType" table="`multinumbertype`">
-		<meta attribute="eclassName">MultiNumberType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="multinumbertypedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="myComplexAbstractGroup" table="`multinumbertype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`multinumbertype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`multinumbertype_mycomplexabstractgroup_idx`"/>
-			<one-to-many entity-name="MultiNumberType_myComplexAbstractGroup"/>
-		</list>
-	</class>
-	<class entity-name="MultiNumberType_myComplexAbstractGroup" lazy="false" table="`multinumbertype_mycomplexabstractgroup`">
-		<meta attribute="featureMap">MultiNumberType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="myComplexAbstract" entity-name="ComplexNumber" lazy="false" cascade="all" foreign-key="multinumbertype_mycomplexabstract" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexnumber_mycomplexabstract_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.NumberTypeImpl" entity-name="NumberType" abstract="false" lazy="false" discriminator-value="NumberType" table="`numbertype`">
-		<meta attribute="eclassName">NumberType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="numbertypedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="mySimpleAbstractGroup" table="`numbertype_mysimpleabstractgroup`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`numbertype_mysimpleabstractgroup_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`numbertype_mysimpleabstractgroup_idx`"/>
-			<one-to-many entity-name="NumberType_mySimpleAbstractGroup"/>
-		</list>
-		<list name="myComplexAbstractGroup" table="`numbertype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`numbertype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`numbertype_mycomplexabstractgroup_idx`"/>
-			<one-to-many entity-name="NumberType_myComplexAbstractGroup"/>
-		</list>
-	</class>
-	<class entity-name="NumberType_mySimpleAbstractGroup" lazy="false" table="`numbertype_mysimpleabstractgroup`">
-		<meta attribute="featureMap">NumberType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="mySimpleAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`mysimpleabstractgroup_mysimpleabstract`"/>
-		</property>
-	</class>
-	<class entity-name="NumberType_myComplexAbstractGroup" lazy="false" table="`numbertype_mycomplexabstractgroup`">
-		<meta attribute="featureMap">NumberType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="myComplexAbstract" entity-name="ComplexNumber" lazy="false" cascade="all" foreign-key="numbertype_mycomplexabstract" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexnumber_mycomplexabstract_e_id`"/>
-		</many-to-one>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.OddComplexNumberTypeImpl" entity-name="OddComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" discriminator-value="OddComplexNumberType">
-		<meta attribute="eclassName">OddComplexNumberType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
-	</subclass>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 748778b2f..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.ComplexNumberImpl" entity-name="ComplexNumber" abstract="false" lazy="false" table="`complexnumber`">
-		<meta attribute="eclassName">ComplexNumber</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
-			<column not-null="true" unique="false" name="`value`"/>
-		</property>
-		<property name="unit" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`unit`"/>
-		</property>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.EvenComplexNumberTypeImpl" entity-name="EvenComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" table="`evencomplexnumbertype`">
-		<meta attribute="eclassName">EvenComplexNumberType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
-		<key>
-			<column name="`complexnumber_e_id`"/>
-		</key>
-	</joined-subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.MultiNumberTypeImpl" entity-name="MultiNumberType" abstract="false" lazy="false" table="`multinumbertype`">
-		<meta attribute="eclassName">MultiNumberType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="myComplexAbstractGroup" table="`multinumbertype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`multinumbertype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`multinumbertype_mycomplexabstractgroup_idx`"/>
-			<one-to-many entity-name="MultiNumberType_myComplexAbstractGroup"/>
-		</list>
-	</class>
-	<class entity-name="MultiNumberType_myComplexAbstractGroup" lazy="false" table="`multinumbertype_mycomplexabstractgroup`">
-		<meta attribute="featureMap">MultiNumberType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="myComplexAbstract" entity-name="ComplexNumber" lazy="false" cascade="all" foreign-key="multinumbertype_mycomplexabstract" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexnumber_mycomplexabstract_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.NumberTypeImpl" entity-name="NumberType" abstract="false" lazy="false" table="`numbertype`">
-		<meta attribute="eclassName">NumberType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="mySimpleAbstractGroup" table="`numbertype_mysimpleabstractgroup`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`numbertype_mysimpleabstractgroup_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`numbertype_mysimpleabstractgroup_idx`"/>
-			<one-to-many entity-name="NumberType_mySimpleAbstractGroup"/>
-		</list>
-		<list name="myComplexAbstractGroup" table="`numbertype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`numbertype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`numbertype_mycomplexabstractgroup_idx`"/>
-			<one-to-many entity-name="NumberType_myComplexAbstractGroup"/>
-		</list>
-	</class>
-	<class entity-name="NumberType_mySimpleAbstractGroup" lazy="false" table="`numbertype_mysimpleabstractgroup`">
-		<meta attribute="featureMap">NumberType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="mySimpleAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`mysimpleabstractgroup_mysimpleabstract`"/>
-		</property>
-	</class>
-	<class entity-name="NumberType_myComplexAbstractGroup" lazy="false" table="`numbertype_mycomplexabstractgroup`">
-		<meta attribute="featureMap">NumberType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="myComplexAbstract" entity-name="ComplexNumber" lazy="false" cascade="all" foreign-key="numbertype_mycomplexabstract" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexnumber_mycomplexabstract_e_id`"/>
-		</many-to-one>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.OddComplexNumberTypeImpl" entity-name="OddComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" table="`oddcomplexnumbertype`">
-		<meta attribute="eclassName">OddComplexNumberType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
-		<key>
-			<column name="`complexnumber_e_id`"/>
-		</key>
-	</joined-subclass>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 748778b2f..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.ComplexNumberImpl" entity-name="ComplexNumber" abstract="false" lazy="false" table="`complexnumber`">
-		<meta attribute="eclassName">ComplexNumber</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigInteger">
-			<column not-null="true" unique="false" name="`value`"/>
-		</property>
-		<property name="unit" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`unit`"/>
-		</property>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.EvenComplexNumberTypeImpl" entity-name="EvenComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" table="`evencomplexnumbertype`">
-		<meta attribute="eclassName">EvenComplexNumberType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
-		<key>
-			<column name="`complexnumber_e_id`"/>
-		</key>
-	</joined-subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.MultiNumberTypeImpl" entity-name="MultiNumberType" abstract="false" lazy="false" table="`multinumbertype`">
-		<meta attribute="eclassName">MultiNumberType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="myComplexAbstractGroup" table="`multinumbertype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`multinumbertype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`multinumbertype_mycomplexabstractgroup_idx`"/>
-			<one-to-many entity-name="MultiNumberType_myComplexAbstractGroup"/>
-		</list>
-	</class>
-	<class entity-name="MultiNumberType_myComplexAbstractGroup" lazy="false" table="`multinumbertype_mycomplexabstractgroup`">
-		<meta attribute="featureMap">MultiNumberType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="myComplexAbstract" entity-name="ComplexNumber" lazy="false" cascade="all" foreign-key="multinumbertype_mycomplexabstract" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexnumber_mycomplexabstract_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.NumberTypeImpl" entity-name="NumberType" abstract="false" lazy="false" table="`numbertype`">
-		<meta attribute="eclassName">NumberType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</property>
-		<list name="mySimpleAbstractGroup" table="`numbertype_mysimpleabstractgroup`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`numbertype_mysimpleabstractgroup_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`numbertype_mysimpleabstractgroup_idx`"/>
-			<one-to-many entity-name="NumberType_mySimpleAbstractGroup"/>
-		</list>
-		<list name="myComplexAbstractGroup" table="`numbertype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`numbertype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`numbertype_mycomplexabstractgroup_idx`"/>
-			<one-to-many entity-name="NumberType_myComplexAbstractGroup"/>
-		</list>
-	</class>
-	<class entity-name="NumberType_mySimpleAbstractGroup" lazy="false" table="`numbertype_mysimpleabstractgroup`">
-		<meta attribute="featureMap">NumberType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="mySimpleAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`mysimpleabstractgroup_mysimpleabstract`"/>
-		</property>
-	</class>
-	<class entity-name="NumberType_myComplexAbstractGroup" lazy="false" table="`numbertype_mycomplexabstractgroup`">
-		<meta attribute="featureMap">NumberType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="myComplexAbstract" entity-name="ComplexNumber" lazy="false" cascade="all" foreign-key="numbertype_mycomplexabstract" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexnumber_mycomplexabstract_e_id`"/>
-		</many-to-one>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.OddComplexNumberTypeImpl" entity-name="OddComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" table="`oddcomplexnumbertype`">
-		<meta attribute="eclassName">OddComplexNumberType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
-		<key>
-			<column name="`complexnumber_e_id`"/>
-		</key>
-	</joined-subclass>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 17e2497e7..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexAAAImpl" entity-name="ComplexAAA" abstract="false" lazy="false" discriminator-value="ComplexAAA" table="`complexaaa`">
-		<meta attribute="eclassName">ComplexAAA</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="complexaaadtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
-			<column not-null="false" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexEvenTypeImpl" entity-name="ComplexEvenType" abstract="false" lazy="false" extends="ComplexAAA" discriminator-value="ComplexEvenType">
-		<meta attribute="eclassName">ComplexEvenType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
-	</subclass>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexOddTypeImpl" entity-name="ComplexOddType" abstract="false" lazy="false" extends="ComplexAAA" discriminator-value="ComplexOddType">
-		<meta attribute="eclassName">ComplexOddType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
-	</subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.RootTypeImpl" entity-name="RootType" abstract="false" lazy="false" discriminator-value="RootType" table="`roottype`">
-		<meta attribute="eclassName">RootType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="roottypedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="myAbstractGroup" table="`roottype_myabstractgroup`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`roottype_myabstractgroup_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`roottype_myabstractgroup_idx`"/>
-			<one-to-many entity-name="RootType_myAbstractGroup"/>
-		</list>
-		<list name="myComplexAbstractGroup" table="`roottype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`roottype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`roottype_mycomplexabstractgroup_idx`"/>
-			<one-to-many entity-name="RootType_myComplexAbstractGroup"/>
-		</list>
-	</class>
-	<class entity-name="RootType_myAbstractGroup" lazy="false" table="`roottype_myabstractgroup`">
-		<meta attribute="featureMap">RootType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="myAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`myabstractgroup_myabstract`"/>
-		</property>
-	</class>
-	<class entity-name="RootType_myComplexAbstractGroup" lazy="false" table="`roottype_mycomplexabstractgroup`">
-		<meta attribute="featureMap">RootType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="myComplexAbstract" entity-name="ComplexAAA" lazy="false" cascade="all" foreign-key="roottype_mycomplexabstract" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexaaa_mycomplexabstract_e_id`"/>
-		</many-to-one>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index c43878c5d..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexAAAImpl" entity-name="ComplexAAA" abstract="false" lazy="false" table="`complexaaa`">
-		<meta attribute="eclassName">ComplexAAA</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
-			<column not-null="false" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexEvenTypeImpl" entity-name="ComplexEvenType" abstract="false" lazy="false" extends="ComplexAAA" table="`complexeventype`">
-		<meta attribute="eclassName">ComplexEvenType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
-		<key>
-			<column name="`complexaaa_e_id`"/>
-		</key>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexOddTypeImpl" entity-name="ComplexOddType" abstract="false" lazy="false" extends="ComplexAAA" table="`complexoddtype`">
-		<meta attribute="eclassName">ComplexOddType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
-		<key>
-			<column name="`complexaaa_e_id`"/>
-		</key>
-	</joined-subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.RootTypeImpl" entity-name="RootType" abstract="false" lazy="false" table="`roottype`">
-		<meta attribute="eclassName">RootType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="myAbstractGroup" table="`roottype_myabstractgroup`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`roottype_myabstractgroup_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`roottype_myabstractgroup_idx`"/>
-			<one-to-many entity-name="RootType_myAbstractGroup"/>
-		</list>
-		<list name="myComplexAbstractGroup" table="`roottype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`roottype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`roottype_mycomplexabstractgroup_idx`"/>
-			<one-to-many entity-name="RootType_myComplexAbstractGroup"/>
-		</list>
-	</class>
-	<class entity-name="RootType_myAbstractGroup" lazy="false" table="`roottype_myabstractgroup`">
-		<meta attribute="featureMap">RootType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="myAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`myabstractgroup_myabstract`"/>
-		</property>
-	</class>
-	<class entity-name="RootType_myComplexAbstractGroup" lazy="false" table="`roottype_mycomplexabstractgroup`">
-		<meta attribute="featureMap">RootType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="myComplexAbstract" entity-name="ComplexAAA" lazy="false" cascade="all" foreign-key="roottype_mycomplexabstract" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexaaa_mycomplexabstract_e_id`"/>
-		</many-to-one>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index c43878c5d..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexAAAImpl" entity-name="ComplexAAA" abstract="false" lazy="false" table="`complexaaa`">
-		<meta attribute="eclassName">ComplexAAA</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
-			<column not-null="false" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexEvenTypeImpl" entity-name="ComplexEvenType" abstract="false" lazy="false" extends="ComplexAAA" table="`complexeventype`">
-		<meta attribute="eclassName">ComplexEvenType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
-		<key>
-			<column name="`complexaaa_e_id`"/>
-		</key>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexOddTypeImpl" entity-name="ComplexOddType" abstract="false" lazy="false" extends="ComplexAAA" table="`complexoddtype`">
-		<meta attribute="eclassName">ComplexOddType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
-		<key>
-			<column name="`complexaaa_e_id`"/>
-		</key>
-	</joined-subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.RootTypeImpl" entity-name="RootType" abstract="false" lazy="false" table="`roottype`">
-		<meta attribute="eclassName">RootType</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="myAbstractGroup" table="`roottype_myabstractgroup`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`roottype_myabstractgroup_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`roottype_myabstractgroup_idx`"/>
-			<one-to-many entity-name="RootType_myAbstractGroup"/>
-		</list>
-		<list name="myComplexAbstractGroup" table="`roottype_mycomplexabstractgroup`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`roottype_mycomplexabstractgroup_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`roottype_mycomplexabstractgroup_idx`"/>
-			<one-to-many entity-name="RootType_myComplexAbstractGroup"/>
-		</list>
-	</class>
-	<class entity-name="RootType_myAbstractGroup" lazy="false" table="`roottype_myabstractgroup`">
-		<meta attribute="featureMap">RootType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<property name="myAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
-			<column not-null="false" unique="false" name="`myabstractgroup_myabstract`"/>
-		</property>
-	</class>
-	<class entity-name="RootType_myComplexAbstractGroup" lazy="false" table="`roottype_mycomplexabstractgroup`">
-		<meta attribute="featureMap">RootType</meta>
-		<id type="long">
-			<generator class="native"/>
-		</id>
-		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="fme_feature" type="java.lang.String"/>
-		<many-to-one name="myComplexAbstract" entity-name="ComplexAAA" lazy="false" cascade="all" foreign-key="roottype_mycomplexabstract" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`mycomplexabstractgroup_complexaaa_mycomplexabstract_e_id`"/>
-		</many-to-one>
-	</class>
-</hibernate-mapping>
\ No newline at end of file