Working on support for hb 4.2.7SP1
diff --git a/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/PersistenceOptions.java b/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/PersistenceOptions.java
index 5c57a33..8c74465 100755
--- a/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/PersistenceOptions.java
+++ b/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/PersistenceOptions.java
@@ -240,6 +240,8 @@
 	 */
 	public static final String ADD_INDEX_FOR_FOREIGN_KEY = MAPPING_PREFIX + "add_index_for_fk";
 
+	public static final String HIBERNATE_VERSION = MAPPING_PREFIX + "hibernate.version";
+
 	/**
 	 * Set or not set the cascade attribute on a mto, mtm or otm non-containment relation. The
 	 * backward compatible value is true. The better performing value is false. The default is false.
@@ -579,6 +581,13 @@
 	}
 
 	/**
+	 * @return value of {@link #HIBERNATE_VERSION}
+	 */
+	public String getHibernateVersion() {
+		return properties.getProperty(HIBERNATE_VERSION);
+	}
+
+	/**
 	 * @return value of {@link #AUDITING_ENTITY_PREFIX}
 	 */
 	public String getAuditingEntityPrefix() {
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToManyMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToManyMapper.java
index 8d1192a..b9c26d2 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToManyMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToManyMapper.java
@@ -194,7 +194,7 @@
 			// To force a jointable on a real otm a jointable annotation should
 			// be specified.
 			final Element mtm = addManyToMany(hbReference, referedToAClass, collElement, targetName,
-					inverseJoinColumns, otm.isUnique());
+					inverseJoinColumns, getUnique(otm.isUnique()));
 			addForeignKeyAttribute(mtm, paReference);
 
 			if (hbReference.getNotFound() != null) {
@@ -302,7 +302,7 @@
 					.getInverseJoinColumns() : new ArrayList<JoinColumn>();
 
 			final Element mtm = addManyToMany(hbReference, referedToAClass, collElement, targetName,
-					inverseJoinColumns, otm.isUnique());
+					inverseJoinColumns, getUnique(otm.isUnique()));
 			addForeignKeyAttribute(mtm, paReference);
 			if (hbReference.getNotFound() != null) {
 				mtm.addAttribute("not-found", hbReference.getNotFound().getAction().getName().toLowerCase());
@@ -321,6 +321,15 @@
 		mapFilter(collElement, ((HbAnnotatedETypeElement) paReference).getFilter());
 	}
 
+	// https://forum.hibernate.org/viewtopic.php?f=1&t=10296
+	protected boolean getUnique(boolean isUnique) {
+		final String hbVersion = getHbmContext().getPersistenceOptions().getHibernateVersion();
+		if (hbVersion == null || !"4.2.7SP1".equals(hbVersion)) {
+			return isUnique;
+		}
+		return false;
+	}
+	
 	/**
 	 * Creates a onetomany element.
 	 * 
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractActionTest.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractActionTest.java
index a382b05..4b52911 100755
--- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractActionTest.java
+++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractActionTest.java
@@ -106,6 +106,8 @@
 		if (!getTestAction().supportAuditing()) {
 			allProperties.setProperty(Constants.ANNOTATION_AUDITING_NOT, "true");
 		}
+
+		allProperties.setProperty(PersistenceOptions.HIBERNATE_VERSION, "4.2.7SP1");
 		
 		// override some defaults
 		if (allProperties.get(PersistenceOptions.SET_DEFAULT_CASCADE_ON_NON_CONTAINMENT) == null) {
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.emf.teneo.hibernate.test/.settings/org.eclipse.core.resources.prefs
deleted file mode 100755
index f5b9de8..0000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Thu Mar 29 15:48:35 CEST 2007
-eclipse.preferences.version=1
-encoding//hbm/org.eclipse.emf.teneo.test.emf.sample/RentalClassifyNamesAction_mysql_a_o_hibernate.hbm.xml=UTF-8
-encoding//hbm/org.eclipse.emf.teneo.test.emf.sample/RentalClassifyNamesAction_mysql_e_o_hibernate.hbm.xml=UTF-8
-encoding//hbm/org.eclipse.emf.teneo.test.emf.sample/RentalClassifyNamesAction_mysql_s_o_hibernate.hbm.xml=UTF-8
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_e_o_hibernate.hbm.xml
index b0ff3c0..0521578 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_e_o_hibernate.hbm.xml
@@ -65,7 +65,7 @@
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_WRITERS_IDX`"/>
-			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+			<many-to-many entity-name="Writer" unique="false" foreign-key="schrijvers">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_h_o_hibernate.hbm.xml
index 2cbcad6..3ab36bc 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_h_o_hibernate.hbm.xml
@@ -74,7 +74,7 @@
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_WRITERS_IDX`"/>
-			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+			<many-to-many entity-name="Writer" unique="false" foreign-key="schrijvers">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_e_o_hibernate.hbm.xml
index b0ff3c0..0521578 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_e_o_hibernate.hbm.xml
@@ -65,7 +65,7 @@
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_WRITERS_IDX`"/>
-			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+			<many-to-many entity-name="Writer" unique="false" foreign-key="schrijvers">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_h_o_hibernate.hbm.xml
index 2cbcad6..3ab36bc 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_h_o_hibernate.hbm.xml
@@ -74,7 +74,7 @@
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_WRITERS_IDX`"/>
-			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+			<many-to-many entity-name="Writer" unique="false" foreign-key="schrijvers">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_e_o_hibernate.hbm.xml
index 8631c85..9446e90 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_e_o_hibernate.hbm.xml
@@ -80,7 +80,7 @@
 				<column name="`RIGHTCOLUMN`" unique="false"/>
 			</key>
 			<list-index column="`HOUSE_VISITORS_IDX`"/>
-			<many-to-many entity-name="Person" unique="true" foreign-key="HOUSE_VISITORS">
+			<many-to-many entity-name="Person" unique="false" foreign-key="HOUSE_VISITORS">
 				<column name="`PERSON_FIRSTNAME`" unique="false"/>
 				<column name="`PERSON_LASTNAME`" unique="false"/>
 			</many-to-many>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_h_o_hibernate.hbm.xml
index f8b9851..89e6ea3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_h_o_hibernate.hbm.xml
@@ -78,7 +78,7 @@
 				<column name="`RIGHTCOLUMN`" unique="false"/>
 			</key>
 			<list-index column="`HOUSE_VISITORS_IDX`"/>
-			<many-to-many entity-name="Person" unique="true" foreign-key="HOUSE_VISITORS">
+			<many-to-many entity-name="Person" unique="false" foreign-key="HOUSE_VISITORS">
 				<column name="`PERSON_FIRSTNAME`" unique="false"/>
 				<column name="`PERSON_LASTNAME`" unique="false"/>
 			</many-to-many>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/Bz398156Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/Bz398156Action_mysql_s_o_hibernate.hbm.xml
new file mode 100644
index 0000000..0e2352a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/Bz398156Action_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
+			<key foreign-key="schrijvers_key" update="true">
+				<column name="`library_writers_e_id`" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" lazy="true" cascade="all,delete-orphan">
+			<key foreign-key="library_books_key" update="true">
+				<column name="`library_books_e_id`" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" lazy="true" cascade="persist,merge,refresh,save-update,lock">
+			<key update="true">
+				<column name="`book_author_e_id`" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditCommitInfoImpl" entity-name="TeneoAuditCommitInfo" abstract="false" lazy="false" table="`teneoauditcommitinfo`">
+		<meta attribute="eclassName" inherit="false">TeneoAuditCommitInfo</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/hibernate/auditing</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="version" type="long">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+		<property name="user" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`user`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`" length="2000"/>
+		</property>
+		<property name="commitTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`committime`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Book" abstract="false" lazy="false" table="`audit_book`">
+		<meta attribute="eclassName" inherit="false">audit_Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</meta>
+		<id name="teneo_audit_id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`teneo_audit_id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="teneo_version" type="long">
+			<column not-null="true" unique="false" name="`teneo_version`"/>
+		</version>
+		<property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_object_id`" unique-key="c0,c1,c2"/>
+		</property>
+		<property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_owner_object_id`"/>
+		</property>
+		<property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_start`" unique-key="c0"/>
+		</property>
+		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_end`" unique-key="c1"/>
+		</property>
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="audit_book_teneo_commit_info" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`teneoauditcommitinfo_teneo_commit_info_id`"/>
+		</many-to-one>
+		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`teneo_audit_kind`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+				<param name="eclassifier">TeneoAuditKind</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+			</type>
+		</property>
+		<property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_container_id`"/>
+		</property>
+		<property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`teneo_container_feature_id`"/>
+		</property>
+		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_previous_start`" unique-key="c2"/>
+		</property>
+		<property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_object_version`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_resourceid`"/>
+		</property>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<property name="author" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`author`"/>
+		</property>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Library" abstract="false" lazy="false" table="`audit_library`">
+		<meta attribute="eclassName" inherit="false">audit_Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</meta>
+		<id name="teneo_audit_id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`teneo_audit_id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="teneo_version" type="long">
+			<column not-null="true" unique="false" name="`teneo_version`"/>
+		</version>
+		<property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_object_id`" unique-key="c0,c1,c2"/>
+		</property>
+		<property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_owner_object_id`"/>
+		</property>
+		<property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_start`" unique-key="c0"/>
+		</property>
+		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_end`" unique-key="c1"/>
+		</property>
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="audit_library_teneo_commit_info" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`teneoauditcommitinfo_teneo_commit_info_id`"/>
+		</many-to-one>
+		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`teneo_audit_kind`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+				<param name="eclassifier">TeneoAuditKind</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+			</type>
+		</property>
+		<property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_container_id`"/>
+		</property>
+		<property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`teneo_container_feature_id`"/>
+		</property>
+		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_previous_start`" unique-key="c2"/>
+		</property>
+		<property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_object_version`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_resourceid`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" table="`audit_library_writersauditing`" lazy="true" cascade="all">
+			<key foreign-key="audit_library_writers_key" update="true">
+				<column name="`audit_library_writers_teneo_audit_id`" unique="false"/>
+			</key>
+			<list-index column="`audit_library_writers_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+		<list name="books" table="`audit_library_booksauditing`" lazy="true" cascade="all">
+			<key foreign-key="audit_library_books_key" update="true">
+				<column name="`audit_library_books_teneo_audit_id`" unique="false"/>
+			</key>
+			<list-index column="`audit_library_books_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Writer" abstract="false" lazy="false" table="`audit_writer`">
+		<meta attribute="eclassName" inherit="false">audit_Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</meta>
+		<id name="teneo_audit_id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`teneo_audit_id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="teneo_version" type="long">
+			<column not-null="true" unique="false" name="`teneo_version`"/>
+		</version>
+		<property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_object_id`" unique-key="c0,c1,c2"/>
+		</property>
+		<property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_owner_object_id`"/>
+		</property>
+		<property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_start`" unique-key="c0"/>
+		</property>
+		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_end`" unique-key="c1"/>
+		</property>
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="audit_writer_teneo_commit_info" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`teneoauditcommitinfo_teneo_commit_info_id`"/>
+		</many-to-one>
+		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`teneo_audit_kind`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+				<param name="eclassifier">TeneoAuditKind</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+			</type>
+		</property>
+		<property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_container_id`"/>
+		</property>
+		<property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`teneo_container_feature_id`"/>
+		</property>
+		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_previous_start`" unique-key="c2"/>
+		</property>
+		<property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_object_version`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_resourceid`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" table="`audit_writer_booksauditing`" lazy="true" cascade="all">
+			<key foreign-key="audit_writer_books_key" update="true">
+				<column name="`audit_writer_books_teneo_audit_id`" unique="false"/>
+			</key>
+			<list-index column="`audit_writer_books_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.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
index 7373b0f..0e6057a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
@@ -36,7 +36,7 @@
 				<column name="`EMPLOYEE_ADDR_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSON_ADDRESS_IDX`"/>
-			<many-to-many entity-name="Address" unique="true" foreign-key="EMPLOYEE_ADDRESS"/>
+			<many-to-many entity-name="Address" unique="false" foreign-key="EMPLOYEE_ADDRESS"/>
 		</list>
 		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`DEPARTMENT`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
index 2734a8a..79c5987 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
@@ -42,7 +42,7 @@
 				<column name="`EMPLOYEE_ADDR_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSON_ADDRESS_IDX`"/>
-			<many-to-many entity-name="Address" unique="true" foreign-key="EMPLOYEE_ADDRESS"/>
+			<many-to-many entity-name="Address" unique="false" foreign-key="EMPLOYEE_ADDRESS"/>
 		</list>
 		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`DEPARTMENT`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_e_o_hibernate.hbm.xml
index 93dccdb..455f1c6 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_e_o_hibernate.hbm.xml
@@ -56,7 +56,7 @@
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`TEST_INDEX`"/>
-			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+			<many-to-many entity-name="Writer" unique="false" foreign-key="schrijvers">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
@@ -86,7 +86,7 @@
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`WRITER_BOOKS_IDX`"/>
-			<many-to-many entity-name="Book" unique="true">
+			<many-to-many entity-name="Book" unique="false">
 				<column name="`BOOK_TITLE`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_h_o_hibernate.hbm.xml
index 41e70d9..85c4184 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_h_o_hibernate.hbm.xml
@@ -62,7 +62,7 @@
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`TEST_INDEX`"/>
-			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
+			<many-to-many entity-name="Writer" unique="false" foreign-key="schrijvers">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
@@ -95,7 +95,7 @@
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`WRITER_BOOKS_IDX`"/>
-			<many-to-many entity-name="Book" unique="true">
+			<many-to-many entity-name="Book" unique="false">
 				<column name="`BOOK_TITLE`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyMoreAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyMoreAction_mysql_s_o_hibernate.hbm.xml
new file mode 100644
index 0000000..e6fcd02
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyMoreAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
+		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+		<param name="edatatype">BookCategoryObject</param>
+	</typedef>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
+		<meta attribute="eclassName" inherit="false">Book</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id name="title" type="java.lang.String">
+			<column not-null="true" unique="false" name="`title`"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="true" update="true" not-null="false">
+			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		</many-to-one>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
+		<meta attribute="eclassName" inherit="false">Library</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" fetch="subselect" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key foreign-key="schrijvers_key" update="true">
+				<column name="`library_writers_e_id`" unique="false"/>
+			</key>
+			<list-index column="`test_index`"/>
+			<one-to-many entity-name="Writer"/>
+		</list>
+		<list name="books" inverse="true" lazy="extra" cascade="all,delete-orphan">
+			<key foreign-key="library_books_key" update="true">
+				<column name="`library_books_e_id`" unique="false"/>
+			</key>
+			<list-index column="`library_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+		<meta attribute="eclassName" inherit="false">Writer</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+		<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+			<column not-null="true" unique="false" name="`name`"/>
+		</property>
+		<list name="books" inverse="true" lazy="extra" cascade="persist,merge,refresh,save-update,lock">
+			<key update="true">
+				<column name="`book_author_e_id`" unique="false"/>
+			</key>
+			<list-index column="`writer_books_idx`"/>
+			<one-to-many entity-name="Book"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditCommitInfoImpl" entity-name="TeneoAuditCommitInfo" abstract="false" lazy="false" table="`teneoauditcommitinfo`">
+		<meta attribute="eclassName" inherit="false">TeneoAuditCommitInfo</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/hibernate/auditing</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="version" type="long">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+		<property name="user" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`user`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`" length="2000"/>
+		</property>
+		<property name="commitTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`committime`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="BookAuditing" abstract="false" lazy="false" table="`bookauditing`">
+		<meta attribute="eclassName" inherit="false">BookAuditing</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</meta>
+		<id name="teneo_audit_id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`teneo_audit_id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="teneo_version" type="long">
+			<column not-null="true" unique="false" name="`teneo_version`"/>
+		</version>
+		<property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_object_id`" unique-key="c0,c1,c2"/>
+		</property>
+		<property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_owner_object_id`"/>
+		</property>
+		<property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_start`" unique-key="c0"/>
+		</property>
+		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_end`" unique-key="c1"/>
+		</property>
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="bookauditing_teneo_commit_info" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`teneoauditcommitinfo_teneo_commit_info_id`"/>
+		</many-to-one>
+		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`teneo_audit_kind`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+				<param name="eclassifier">TeneoAuditKind</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+			</type>
+		</property>
+		<property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_container_id`"/>
+		</property>
+		<property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`teneo_container_feature_id`"/>
+		</property>
+		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_previous_start`" unique-key="c2"/>
+		</property>
+		<property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_object_version`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_resourceid`"/>
+		</property>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`title`"/>
+		</property>
+		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`pages`"/>
+		</property>
+		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`category`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
+				<param name="eclassifier">BookCategory</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
+			</type>
+		</property>
+		<property name="author" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`author`"/>
+		</property>
+		<property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`test`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="LibraryAuditing" abstract="false" lazy="false" table="`libraryauditing`">
+		<meta attribute="eclassName" inherit="false">LibraryAuditing</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</meta>
+		<id name="teneo_audit_id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`teneo_audit_id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="teneo_version" type="long">
+			<column not-null="true" unique="false" name="`teneo_version`"/>
+		</version>
+		<property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_object_id`" unique-key="c0,c1,c2"/>
+		</property>
+		<property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_owner_object_id`"/>
+		</property>
+		<property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_start`" unique-key="c0"/>
+		</property>
+		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_end`" unique-key="c1"/>
+		</property>
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="libraryauditing_teneo_commit_info" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`teneoauditcommitinfo_teneo_commit_info_id`"/>
+		</many-to-one>
+		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`teneo_audit_kind`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+				<param name="eclassifier">TeneoAuditKind</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+			</type>
+		</property>
+		<property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_container_id`"/>
+		</property>
+		<property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`teneo_container_feature_id`"/>
+		</property>
+		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_previous_start`" unique-key="c2"/>
+		</property>
+		<property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_object_version`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_resourceid`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="writers" table="`libraryauditing_writersauditing`" lazy="extra" cascade="all">
+			<key foreign-key="libraryauditing_writers_key" update="true">
+				<column name="`libraryauditing_writers_teneo_audit_id`" unique="false"/>
+			</key>
+			<list-index column="`libraryauditing_writers_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+		<list name="books" table="`libraryauditing_booksauditing`" lazy="extra" cascade="all">
+			<key foreign-key="libraryauditing_books_key" update="true">
+				<column name="`libraryauditing_books_teneo_audit_id`" unique="false"/>
+			</key>
+			<list-index column="`libraryauditing_books_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterAuditing" abstract="false" lazy="false" table="`writerauditing`">
+		<meta attribute="eclassName" inherit="false">WriterAuditing</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</meta>
+		<id name="teneo_audit_id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`teneo_audit_id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="teneo_version" type="long">
+			<column not-null="true" unique="false" name="`teneo_version`"/>
+		</version>
+		<property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_object_id`" unique-key="c0,c1,c2"/>
+		</property>
+		<property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_owner_object_id`"/>
+		</property>
+		<property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_start`" unique-key="c0"/>
+		</property>
+		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_end`" unique-key="c1"/>
+		</property>
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="writerauditing_teneo_commit_info" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`teneoauditcommitinfo_teneo_commit_info_id`"/>
+		</many-to-one>
+		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`teneo_audit_kind`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+				<param name="eclassifier">TeneoAuditKind</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+			</type>
+		</property>
+		<property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_container_id`"/>
+		</property>
+		<property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`teneo_container_feature_id`"/>
+		</property>
+		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_previous_start`" unique-key="c2"/>
+		</property>
+		<property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_object_version`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_resourceid`"/>
+		</property>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<list name="books" table="`writerauditing_booksauditing`" lazy="extra" cascade="all">
+			<key foreign-key="writerauditing_books_key" update="true">
+				<column name="`writerauditing_books_teneo_audit_id`" unique="false"/>
+			</key>
+			<list-index column="`writerauditing_books_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.hibernate.test.issues/Bz391134Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz391134Action_hsqldb_e_o_hibernate.hbm.xml
index 8194245..34578f1 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz391134Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz391134Action_hsqldb_e_o_hibernate.hbm.xml
@@ -17,7 +17,7 @@
 				<column name="`BAR_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`BAR_FOO_IDX`"/>
-			<many-to-many entity-name="Foo" unique="true" foreign-key="BAR_FOO">
+			<many-to-many entity-name="Foo" unique="false" foreign-key="BAR_FOO">
 				<column name="`FOO_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz391134Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz391134Action_hsqldb_h_o_hibernate.hbm.xml
index b03d1f1..c136669 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz391134Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz391134Action_hsqldb_h_o_hibernate.hbm.xml
@@ -20,7 +20,7 @@
 				<column name="`BAR_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`BAR_FOO_IDX`"/>
-			<many-to-many entity-name="Foo" unique="true" foreign-key="BAR_FOO">
+			<many-to-many entity-name="Foo" unique="false" foreign-key="BAR_FOO">
 				<column name="`FOO_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz398161Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz398161Action_hsqldb_e_o_hibernate.hbm.xml
index 05b74f7..8af60d6 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz398161Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz398161Action_hsqldb_e_o_hibernate.hbm.xml
@@ -15,6 +15,9 @@
 		<many-to-one name="refTwo" entity-name="RefTwo" lazy="false" cascade="all" foreign-key="REFONE_REFTWO" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`PRODR_NUM`" sql-type="CHARACTER(6) NOT NULL"/>
 		</many-to-one>
+		<property name="stringVal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`STRINGVAL`" sql-type="CHARACTER(64) NOT NULL"/>
+		</property>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz398161.impl.RefTwoImpl" entity-name="RefTwo" abstract="false" lazy="false" table="`REFTWO`">
 		<meta attribute="eclassName" inherit="false">RefTwo</meta>
@@ -100,6 +103,9 @@
 		<property name="refTwo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`REFTWO`"/>
 		</property>
+		<property name="stringVal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`STRINGVAL`" sql-type="CHARACTER(64) NOT NULL"/>
+		</property>
 	</class>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="RefTwoAuditing" abstract="false" lazy="false" table="`REFTWOAUDITING`">
 		<meta attribute="eclassName" inherit="false">RefTwoAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz398161Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz398161Action_hsqldb_h_o_hibernate.hbm.xml
index 2a0ca2e..6d7a84d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz398161Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz398161Action_hsqldb_h_o_hibernate.hbm.xml
@@ -18,6 +18,9 @@
 		<many-to-one name="refTwo" entity-name="RefTwo" lazy="false" cascade="all" foreign-key="REFONE_REFTWO" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`PRODR_NUM`" sql-type="CHARACTER(6) NOT NULL"/>
 		</many-to-one>
+		<property name="stringVal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`STRINGVAL`" sql-type="CHARACTER(64) NOT NULL"/>
+		</property>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz398161.impl.RefTwoImpl" entity-name="RefTwo" abstract="false" lazy="false" discriminator-value="RefTwo" table="`REFTWO`">
 		<meta attribute="eclassName" inherit="false">RefTwo</meta>
@@ -112,6 +115,9 @@
 		<property name="refTwo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`REFTWO`"/>
 		</property>
+		<property name="stringVal" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`STRINGVAL`" sql-type="CHARACTER(64) NOT NULL"/>
+		</property>
 	</class>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="RefTwoAuditing" abstract="false" lazy="false" discriminator-value="RefTwoAuditing" table="`REFTWOAUDITING`">
 		<meta attribute="eclassName" inherit="false">RefTwoAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_e_o_hibernate.hbm.xml
index 58aad1f..7e7e911 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_e_o_hibernate.hbm.xml
@@ -16,7 +16,7 @@
 				<column name="`CASE1_BDSID`" unique="false"/>
 			</key>
 			<list-index column="`CASE1_CASE2_IDX`"/>
-			<many-to-many entity-name="com.example.robtest.Case2" unique="true" foreign-key="CASE1_CASE2">
+			<many-to-many entity-name="com.example.robtest.Case2" unique="false" foreign-key="CASE1_CASE2">
 				<column name="`CASE2_BDSID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_h_o_hibernate.hbm.xml
index 3835295..8bade3d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_h_o_hibernate.hbm.xml
@@ -19,7 +19,7 @@
 				<column name="`CASE1_BDSID`" unique="false"/>
 			</key>
 			<list-index column="`CASE1_CASE2_IDX`"/>
-			<many-to-many entity-name="com.example.robtest.Case2" unique="true" foreign-key="CASE1_CASE2">
+			<many-to-many entity-name="com.example.robtest.Case2" unique="false" foreign-key="CASE1_CASE2">
 				<column name="`CASE2_BDSID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_e_o_hibernate.hbm.xml
index dc0aa1b..58d27a8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_e_o_hibernate.hbm.xml
@@ -87,7 +87,7 @@
 			<key update="true">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</key>
-			<many-to-many entity-name="Book" unique="true">
+			<many-to-many entity-name="Book" unique="false">
 				<column name="`BOOK_TITLE`" unique="false"/>
 			</many-to-many>
 		</bag>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_h_o_hibernate.hbm.xml
index a1eece8..631cae3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_h_o_hibernate.hbm.xml
@@ -96,7 +96,7 @@
 			<key update="true">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</key>
-			<many-to-many entity-name="Book" unique="true">
+			<many-to-many entity-name="Book" unique="false">
 				<column name="`BOOK_TITLE`" unique="false"/>
 			</many-to-many>
 		</bag>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_e_o_hibernate.hbm.xml
index 0fbabb4..2b9d001 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_e_o_hibernate.hbm.xml
@@ -16,7 +16,7 @@
 			<key update="true">
 				<column name="`ONE_E_ID`" unique="false"/>
 			</key>
-			<many-to-many entity-name="Many" unique="true">
+			<many-to-many entity-name="Many" unique="false">
 				<column name="`MANY_E_ID`" unique="false"/>
 			</many-to-many>
 		</bag>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_h_o_hibernate.hbm.xml
index 8d5abff..b4dbdf8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_h_o_hibernate.hbm.xml
@@ -19,7 +19,7 @@
 			<key update="true">
 				<column name="`ONE_E_ID`" unique="false"/>
 			</key>
-			<many-to-many entity-name="Many" unique="true">
+			<many-to-many entity-name="Many" unique="false">
 				<column name="`MANY_E_ID`" unique="false"/>
 			</many-to-many>
 		</bag>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/dbadapters.properties b/tests/org.eclipse.emf.teneo.hibernate.test/src/dbadapters.properties
index 79a02f4..8297501 100755
--- a/tests/org.eclipse.emf.teneo.hibernate.test/src/dbadapters.properties
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/dbadapters.properties
@@ -26,8 +26,8 @@
 # Note that the database name is not specified because this is set automatically
 
 mysql.dburl=jdbc:mysql://127.0.0.1:3306/
-mysql.dbuser=teneo
-mysql.dbpassword=teneo1
+mysql.dbuser=root
+mysql.dbpassword=root
 mysql.dbdriver=com.mysql.jdbc.Driver
 mysql.dbadapter=org.eclipse.emf.teneo.hibernate.test.stores.adapters.HibernateMysqlDBAdapter
 
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/jpa2/AllTests.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/jpa2/AllTests.java
index 7d5ce18..42ccba6 100755
--- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/jpa2/AllTests.java
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/jpa2/AllTests.java
@@ -26,6 +26,12 @@
 		TestSuite suite = new MultiCfgTestSuite(
 				"Test for org.eclipse.emf.teneo.hibernate.test.emf.jpa2", HibernateTestbed.instance()
 						.getConfigurations());
+
+		// if (true) {
+		// suite.addTestSuite(JPA2AssociationOverrideAction.class);
+		// return suite;
+		// }
+
 		suite.addTestSuite(MapKeyColumnAction.class);
 		suite.addTestSuite(MapKeyJoinColumnAction.class);
 		suite.addTestSuite(MapKeyTypesAction.class);
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryExtraLazyMoreAction.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryExtraLazyMoreAction.java
index 331d08b..3b73f84 100755
--- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryExtraLazyMoreAction.java
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryExtraLazyMoreAction.java
@@ -145,6 +145,7 @@
 			store.beginTransaction();
 			final Writer w1 = store.getObject(Writer.class);
 			checkIsStillLazy(w1.getBooks());
+			Book b1 = w1.getBooks().get(0);
 			w1.getBooks().clear();
 			store.commitTransaction();
 		}
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/schemaconstructs/AllTests.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/schemaconstructs/AllTests.java
index 252127e..c2ea3bb 100755
--- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/schemaconstructs/AllTests.java
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/schemaconstructs/AllTests.java
@@ -43,6 +43,7 @@
 				"Test for org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs", HibernateTestbed
 						.instance().getConfigurations());
 		// if (true) {
+		// suite.addTestSuite(EMapAsListExtraLazyAction.class);
 		// return suite;
 		// }
 
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/Bz398161Action.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/Bz398161Action.java
index d2185ab..134dbab 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/Bz398161Action.java
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/Bz398161Action.java
@@ -40,6 +40,7 @@
 			RefOne refOne = factory.createRefOne();
 			RefTwo refTwo = factory.createRefTwo();
 			refOne.setRefTwo(refTwo);
+			refOne.setStringVal("val");
 			refTwo.setNumber("abc");
 			store.store(refTwo);
 			store.store(refOne);
diff --git a/tests/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF
index a506f74..f2820be 100755
--- a/tests/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF
@@ -14,80 +14,27 @@
 Eclipse-BuddyPolicy: dependent
 Bundle-Vendor: %Plugin.providerName
 Export-Package: com.example.car;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- com.example.car.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   com.example.car,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
+ com.example.car.impl;uses:="org.eclipse.emf.ecore.impl,  com.example.car,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
  com.example.car.model,
- com.example.car.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   com.example.car,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ com.example.car.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  com.example.car,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  com.example.car.validation;uses:="com.example.car,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
  com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test,
  com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl,
  com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.util,
  com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.validation,
  extlibrary;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- extlibrary.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   extlibrary,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
+ extlibrary.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  extlibrary,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
  extlibrary.model,
- extlibrary.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   extlibrary,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ extlibrary.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  extlibrary,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  fleet,
  fleet.impl,
  fleet.util,
  lobj;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- lobj.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   lobj,
-   org.eclipse.emf.ecore",
- lobj.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore,
-   lobj",
+ lobj.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  lobj,  org.eclipse.emf.ecore",
+ lobj.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore,  lobj",
  main;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- main.impl;
-  uses:="main,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
- main.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   main,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.ecore",
+ main.impl;uses:="main,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ main.util;uses:="org.eclipse.emf.common.notify.impl,  main,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
  org.eclipse.bpmn2,
  org.eclipse.bpmn2.di,
  org.eclipse.bpmn2.di.impl,
@@ -101,259 +48,94 @@
  org.eclipse.dd.di.impl,
  org.eclipse.dd.di.util,
  org.eclipse.emf.teneo.rental;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.rental.impl;
-  uses:="org.eclipse.emf.teneo.rental,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.rental.impl;uses:="org.eclipse.emf.teneo.rental,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.rental.model,
- org.eclipse.emf.teneo.rental.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.teneo.rental,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.rental.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.rental,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.rental.validation;uses:="org.eclipse.emf.teneo.rental,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.emf.annotations.any,
  org.eclipse.emf.teneo.samples.emf.annotations.any.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.any.util,
- org.eclipse.emf.teneo.samples.emf.annotations.associationoverride;uses:="org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.associationoverride,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.associationoverride;uses:=org.eclipse.emf.ecore,
+ org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.annotations.associationoverride,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.model,
- org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.associationoverride,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride",
- org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.annotations.associationoverride,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.validation;uses:=org.eclipse.emf.teneo.samples.emf.annotations.associationoverride,
+ org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl;uses:="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides,org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.model,
- org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides",
+ org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.validation;uses:=org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides,
  org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable,
  org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.util,
- org.eclipse.emf.teneo.samples.emf.annotations.basic;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.basic;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.emf.annotations.basic.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.basic,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.basic.model,
- org.eclipse.emf.teneo.samples.emf.annotations.basic.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.annotations.basic,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.basic.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.basic,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.basic.validation,
  org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl;
-  uses:="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl;uses:="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.model,
- org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.annotations.column;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.column;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.emf.annotations.column.impl;uses:="org.eclipse.emf.teneo.samples.emf.annotations.column,org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.column.model,
- org.eclipse.emf.teneo.samples.emf.annotations.column.util;
-  uses:="org.eclipse.emf.teneo.samples.emf.annotations.column,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.column.util;uses:="org.eclipse.emf.teneo.samples.emf.annotations.column,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.column.validation,
  org.eclipse.emf.teneo.samples.emf.annotations.compositeid;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.teneo.samples.emf.annotations.compositeid",
+ org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.teneo.samples.emf.annotations.compositeid",
  org.eclipse.emf.teneo.samples.emf.annotations.compositeid.model,
- org.eclipse.emf.teneo.samples.emf.annotations.compositeid.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.annotations.compositeid,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.compositeid.validation;uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.compositeid.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.compositeid,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.compositeid.validation;uses:=org.eclipse.emf.common.util,
  org.eclipse.emf.teneo.samples.emf.annotations.duplicates;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.duplicates,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.annotations.duplicates,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.duplicates.model,
- org.eclipse.emf.teneo.samples.emf.annotations.duplicates.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.duplicates,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.duplicates.validation;uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.duplicates.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.annotations.duplicates,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.duplicates.validation;uses:=org.eclipse.emf.common.util,
  org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary,
  org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.util,
  org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.validation,
- org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.model,
- org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.validation,
  org.eclipse.emf.teneo.samples.emf.annotations.embedded;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.annotations.embedded,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.embedded,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.embedded.model,
- org.eclipse.emf.teneo.samples.emf.annotations.embedded.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.annotations.embedded,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.embedded.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.embedded,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.annotations.embedded.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.embedded,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.annotations.embeddedid;uses:="org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.embeddedid,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.embeddedid;uses:=org.eclipse.emf.ecore,
+ org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.annotations.embeddedid,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.model,
- org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.embeddedid,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid",
- org.eclipse.emf.teneo.samples.emf.annotations.entity;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.emf.annotations.embeddedid,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.validation;uses:=org.eclipse.emf.teneo.samples.emf.annotations.embeddedid,
+ org.eclipse.emf.teneo.samples.emf.annotations.entity;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.emf.annotations.entity.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore,org.eclipse.emf.teneo.samples.emf.annotations.entity",
  org.eclipse.emf.teneo.samples.emf.annotations.entity.model,
- org.eclipse.emf.teneo.samples.emf.annotations.entity.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.teneo.samples.emf.annotations.entity",
+ org.eclipse.emf.teneo.samples.emf.annotations.entity.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore,  org.eclipse.emf.teneo.samples.emf.annotations.entity",
  org.eclipse.emf.teneo.samples.emf.annotations.entity.validation,
  org.eclipse.emf.teneo.samples.emf.annotations.external,
  org.eclipse.emf.teneo.samples.emf.annotations.external.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.external.util,
  org.eclipse.emf.teneo.samples.emf.annotations.extralazy;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.extralazy,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.annotations.extralazy,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.extralazy.model,
- org.eclipse.emf.teneo.samples.emf.annotations.extralazy.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.extralazy,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.extralazy.validation;uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.extralazy.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.emf.annotations.extralazy,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.extralazy.validation;uses:=org.eclipse.emf.common.util,
  org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.model,
- org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.validation;uses:="org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.validation;uses:=org.eclipse.emf.common.util,
+ org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.model,
- org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.validation;uses:="javax.xml.datatype",
+ org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.validation;uses:=javax.xml.datatype,
  org.eclipse.emf.teneo.samples.emf.annotations.hbcascade,
  org.eclipse.emf.teneo.samples.emf.annotations.hbcascade.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.hbcascade.util,
@@ -363,411 +145,123 @@
  org.eclipse.emf.teneo.samples.emf.annotations.hibernate,
  org.eclipse.emf.teneo.samples.emf.annotations.hibernate.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.hibernate.util,
- org.eclipse.emf.teneo.samples.emf.annotations.id;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.id;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.emf.annotations.id.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.id,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.id.model,
- org.eclipse.emf.teneo.samples.emf.annotations.id.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.annotations.id,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.id.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.id,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.annotations.id.validation,
  org.eclipse.emf.teneo.samples.emf.annotations.idbag;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.annotations.idbag,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.idbag,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.idbag.model,
- org.eclipse.emf.teneo.samples.emf.annotations.idbag.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.teneo.samples.emf.annotations.idbag,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.idbag.validation;uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.idbag.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.teneo.samples.emf.annotations.idbag,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.idbag.validation;uses:=org.eclipse.emf.common.util,
  org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.model,
- org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping",
  org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator,
  org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.util,
  org.eclipse.emf.teneo.samples.emf.annotations.joincolumns;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.annotations.joincolumns,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.joincolumns,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.model,
- org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.annotations.joincolumns,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.joincolumns,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns,org.eclipse.emf.common.util",
  org.eclipse.emf.teneo.samples.emf.annotations.lazy;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.annotations.lazy,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.lazy,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.lazy.model,
- org.eclipse.emf.teneo.samples.emf.annotations.lazy.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.annotations.lazy,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.lazy.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.lazy,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.annotations.lazy.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.annotations.lazy",
- org.eclipse.emf.teneo.samples.emf.annotations.lob;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.lob;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.emf.annotations.lob.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.lob,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.lob.model,
- org.eclipse.emf.teneo.samples.emf.annotations.lob.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.annotations.lob,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.lob.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.lob,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.lob.validation,
  org.eclipse.emf.teneo.samples.emf.annotations.manytomany;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.annotations.manytomany,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.manytomany,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.manytomany.model,
- org.eclipse.emf.teneo.samples.emf.annotations.manytomany.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.annotations.manytomany,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.manytomany.validation;uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.manytomany.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.manytomany,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.manytomany.validation;uses:=org.eclipse.emf.common.util,
  org.eclipse.emf.teneo.samples.emf.annotations.mapkey;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl;
-  uses:="org.eclipse.emf.teneo.samples.emf.annotations.mapkey,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl;uses:="org.eclipse.emf.teneo.samples.emf.annotations.mapkey,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.mapkey.model,
- org.eclipse.emf.teneo.samples.emf.annotations.mapkey.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.mapkey,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.mapkey.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.annotations.mapkey,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.mapkey.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.mapkey,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.model,
- org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.validation,
  org.eclipse.emf.teneo.samples.emf.annotations.naturalId,
  org.eclipse.emf.teneo.samples.emf.annotations.naturalId.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.naturalId.util,
  org.eclipse.emf.teneo.samples.emf.annotations.nmset;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.nmset,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.annotations.nmset,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.nmset.model,
- org.eclipse.emf.teneo.samples.emf.annotations.nmset.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.nmset,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.nmset.validation;uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.nmset.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.annotations.nmset,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.nmset.validation;uses:=org.eclipse.emf.common.util,
  org.eclipse.emf.teneo.samples.emf.annotations.otopk,
  org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.otopk.util,
- org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin;uses:="org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin;uses:=org.eclipse.emf.ecore,
+ org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.model,
- org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin",
- org.eclipse.emf.teneo.samples.emf.annotations.secondarytable;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.validation;uses:=org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin,
+ org.eclipse.emf.teneo.samples.emf.annotations.secondarytable;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.secondarytable,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.model,
- org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.annotations.secondarytable,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.secondarytable,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.validation,
- org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.impl;uses:="org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate,org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.model,
- org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.validation,
  org.eclipse.emf.teneo.samples.emf.annotations.set;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.set.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.annotations.set,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.set.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.set,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.set.model,
- org.eclipse.emf.teneo.samples.emf.annotations.set.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.annotations.set,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.set.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.set,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.set.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.set,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.annotations.toone;uses:="org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.toone.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.annotations.toone,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.toone;uses:=org.eclipse.emf.ecore,
+ org.eclipse.emf.teneo.samples.emf.annotations.toone.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.toone,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.toone.model,
- org.eclipse.emf.teneo.samples.emf.annotations.toone.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.annotations.toone,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.toone.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.toone",
- org.eclipse.emf.teneo.samples.emf.annotations.transent;uses:="org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.transent.impl;
-  uses:="org.eclipse.emf.teneo.samples.emf.annotations.transent,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.toone.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.toone,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.toone.validation;uses:=org.eclipse.emf.teneo.samples.emf.annotations.toone,
+ org.eclipse.emf.teneo.samples.emf.annotations.transent;uses:=org.eclipse.emf.ecore,
+ org.eclipse.emf.teneo.samples.emf.annotations.transent.impl;uses:="org.eclipse.emf.teneo.samples.emf.annotations.transent,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.transent.model,
- org.eclipse.emf.teneo.samples.emf.annotations.transent.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.teneo.samples.emf.annotations.transent,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.transent.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.transent",
- org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.transent.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.teneo.samples.emf.annotations.transent,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.transent.validation;uses:=org.eclipse.emf.teneo.samples.emf.annotations.transent,
+ org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.model,
- org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints",
+ org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.validation;uses:=org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints,
  org.eclipse.emf.teneo.samples.emf.annotations.various,
  org.eclipse.emf.teneo.samples.emf.annotations.various.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.various.util,
  org.eclipse.emf.teneo.samples.emf.detach.detachelist;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.detach.detachelist.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.detach.detachelist,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.detach.detachelist.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.detach.detachelist,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.detach.detachelist.model,
- org.eclipse.emf.teneo.samples.emf.detach.detachelist.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.teneo.samples.emf.detach.detachelist,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.detach.detachelist.validation;uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.detach.detachelist.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.detach.detachelist,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.detach.detachelist.validation;uses:=org.eclipse.emf.common.util,
  org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.model,
- org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.presentation;
-  uses:="org.eclipse.jface.viewers,
-   org.eclipse.swt.events,
-   org.eclipse.emf.edit.ui.action,
-   org.eclipse.emf.common.ui.viewer,
-   org.eclipse.jface.action,
-   org.eclipse.emf.edit.domain,
-   org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap,
-   org.eclipse.swt.widgets,
-   org.eclipse.core.runtime,
-   org.eclipse.emf.ecore,
-   org.eclipse.ui.dialogs,
-   org.eclipse.emf.common.ui,
-   org.eclipse.ui.views.properties,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.edit.provider,
-   org.eclipse.core.resources,
-   org.eclipse.emf.common.util,
-   org.eclipse.ui,
-   org.eclipse.ui.part,
-   org.eclipse.ui.ide,
-   org.eclipse.ui.views.contentoutline,
-   org.eclipse.jface.wizard,
-   org.eclipse.emf.edit.ui.provider",
- org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.provider;
-  uses:="org.eclipse.emf.common,
-   org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.util,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.edit.provider,
-   org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.presentation;uses:="org.eclipse.jface.viewers,  org.eclipse.swt.events,  org.eclipse.emf.edit.ui.action,  org.eclipse.emf.common.ui.viewer,  org.eclipse.jface.action,  org.eclipse.emf.edit.domain,  org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap,  org.eclipse.swt.widgets,  org.eclipse.core.runtime,  org.eclipse.emf.ecore,  org.eclipse.ui.dialogs,  org.eclipse.emf.common.ui,  org.eclipse.ui.views.properties,  org.eclipse.emf.common.notify,  org.eclipse.emf.edit.provider,  org.eclipse.core.resources,  org.eclipse.emf.common.util,  org.eclipse.ui,  org.eclipse.ui.part,  org.eclipse.ui.ide,  org.eclipse.ui.views.contentoutline,  org.eclipse.jface.wizard,  org.eclipse.emf.edit.ui.provider",
+ org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.provider;uses:="org.eclipse.emf.common,  org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.edit.provider,  org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.detach.detachtest;uses:="org.eclipse.emf.common.util,javax.xml.datatype,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl;
-  uses:="org.eclipse.emf.teneo.samples.emf.detach.detachtest,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   javax.xml.datatype,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl;uses:="org.eclipse.emf.teneo.samples.emf.detach.detachtest,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  javax.xml.datatype,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.detach.detachtest.model,
- org.eclipse.emf.teneo.samples.emf.detach.detachtest.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.teneo.samples.emf.detach.detachtest,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.detach.detachtest.validation;
-  uses:="org.eclipse.emf.teneo.samples.emf.detach.detachtest,
-   org.eclipse.emf.common.util,
-   javax.xml.datatype,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.detach.detachtest.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.detach.detachtest,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.detach.detachtest.validation;uses:="org.eclipse.emf.teneo.samples.emf.detach.detachtest,  org.eclipse.emf.common.util,  javax.xml.datatype,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.elist.featuremap;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.elist.featuremap,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.elist.featuremap,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.elist.featuremap.model,
- org.eclipse.emf.teneo.samples.emf.elist.featuremap.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.elist.featuremap,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.elist.featuremap.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.elist.featuremap,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.elist.featuremap.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.elist.featuremap,org.eclipse.emf.ecore.util",
  org.eclipse.emf.teneo.samples.emf.jpa2.associationoverride,
  org.eclipse.emf.teneo.samples.emf.jpa2.associationoverride.impl,
@@ -790,117 +284,34 @@
  org.eclipse.emf.teneo.samples.emf.jpa2.orphanremoval,
  org.eclipse.emf.teneo.samples.emf.jpa2.orphanremoval.impl,
  org.eclipse.emf.teneo.samples.emf.jpa2.orphanremoval.util,
- org.eclipse.emf.teneo.samples.emf.relation.relation1to1;uses:="org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.relation.relation1to1,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.relation.relation1to1;uses:=org.eclipse.emf.ecore,
+ org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.relation.relation1to1,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.relation.relation1to1.model,
- org.eclipse.emf.teneo.samples.emf.relation.relation1to1.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.teneo.samples.emf.relation.relation1to1,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.relation.relation1to1.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.relation.relation1to1,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.relation.relation1to1.validation;uses:="org.eclipse.emf.teneo.samples.emf.relation.relation1to1",
  org.eclipse.emf.teneo.samples.emf.relation.relation1ton;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.relation.relation1ton,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.relation.relation1ton,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.relation.relation1ton.model,
- org.eclipse.emf.teneo.samples.emf.relation.relation1ton.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.relation.relation1ton,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.relation.relation1ton.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.relation.relation1ton,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.relation.relation1ton.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.relation.relation1ton",
  org.eclipse.emf.teneo.samples.emf.relation.relationntom;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.relation.relationntom,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.relation.relationntom,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.relation.relationntom.model,
- org.eclipse.emf.teneo.samples.emf.relation.relationntom.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.relation.relationntom,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.relation.relationntom.validation;uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.relation.relationntom.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.relation.relationntom,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.relation.relationntom.validation;uses:=org.eclipse.emf.common.util,
  org.eclipse.emf.teneo.samples.emf.sample.accounting;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.accounting.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.sample.accounting,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.accounting.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.sample.accounting,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.accounting.model,
- org.eclipse.emf.teneo.samples.emf.sample.accounting.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.teneo.samples.emf.sample.accounting,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.sample.accounting.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.teneo.samples.emf.sample.accounting,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.sample.accounting.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.accounting,org.eclipse.emf.common.util",
  org.eclipse.emf.teneo.samples.emf.sample.capa;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.capa.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.sample.capa,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.capa.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.capa,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.capa.model,
- org.eclipse.emf.teneo.samples.emf.sample.capa.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.sample.capa,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.capa.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.capa,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.catalog;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.catalog.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.sample.catalog,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.catalog.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.sample.catalog,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.catalog.model,
- org.eclipse.emf.teneo.samples.emf.sample.catalog.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.teneo.samples.emf.sample.catalog,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.catalog.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.sample.catalog,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.catalog.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.catalog,org.eclipse.emf.common.util",
  org.eclipse.emf.teneo.samples.emf.sample.claim,
  org.eclipse.emf.teneo.samples.emf.sample.claim.impl,
@@ -908,24 +319,9 @@
  org.eclipse.emf.teneo.samples.emf.sample.claim.util,
  org.eclipse.emf.teneo.samples.emf.sample.claim.validation,
  org.eclipse.emf.teneo.samples.emf.sample.dynamic;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl;
-  uses:="org.eclipse.emf.teneo.samples.emf.sample.dynamic,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl;uses:="org.eclipse.emf.teneo.samples.emf.sample.dynamic,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.dynamic.model,
- org.eclipse.emf.teneo.samples.emf.sample.dynamic.util;
-  uses:="org.eclipse.emf.teneo.samples.emf.sample.dynamic,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.dynamic.util;uses:="org.eclipse.emf.teneo.samples.emf.sample.dynamic,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.dynamic.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
  org.eclipse.emf.teneo.samples.emf.sample.employee,
  org.eclipse.emf.teneo.samples.emf.sample.employee.impl,
@@ -933,263 +329,69 @@
  org.eclipse.emf.teneo.samples.emf.sample.employee.util,
  org.eclipse.emf.teneo.samples.emf.sample.employee.validation,
  org.eclipse.emf.teneo.samples.emf.sample.epo2;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.epo2.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.sample.epo2,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.epo2.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.epo2,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.epo2.model,
- org.eclipse.emf.teneo.samples.emf.sample.epo2.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.sample.epo2,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.epo2.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.epo2,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.epo2.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.epo2,org.eclipse.emf.common.util",
  org.eclipse.emf.teneo.samples.emf.sample.forum;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.forum.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.sample.forum,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.forum.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.sample.forum,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.forum.model,
- org.eclipse.emf.teneo.samples.emf.sample.forum.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.sample.forum,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.forum.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.forum,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.forum.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.forum,org.eclipse.emf.common.util",
  org.eclipse.emf.teneo.samples.emf.sample.inv;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.inv.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.sample.inv,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.inv.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.inv,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.inv.model,
- org.eclipse.emf.teneo.samples.emf.sample.inv.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.sample.inv,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.inv.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.inv,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.library;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.library.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.sample.library,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.library.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.library,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.library.model,
- org.eclipse.emf.teneo.samples.emf.sample.library.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.sample.library,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.library.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.library,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.library.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.sample.library",
  org.eclipse.emf.teneo.samples.emf.sample.play;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.play.data,
- org.eclipse.emf.teneo.samples.emf.sample.play.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.sample.play,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.play.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.sample.play,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.play.model,
- org.eclipse.emf.teneo.samples.emf.sample.play.util;
-  uses:="org.eclipse.emf.ecore.xml.type.util,
-   org.eclipse.emf.teneo.samples.emf.sample.play,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.play.util;uses:="org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.teneo.samples.emf.sample.play,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.play.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.play,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
  org.eclipse.emf.teneo.samples.emf.sample.product;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.product.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.sample.product,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.product.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.product,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.product.model,
- org.eclipse.emf.teneo.samples.emf.sample.product.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.sample.product,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.sample.product.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.product,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.sample.product.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.sample.product,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo;
-  uses:="org.eclipse.emf.common.util,
-   javax.xml.datatype,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo,
-   javax.xml.datatype,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo;uses:="org.eclipse.emf.common.util,  javax.xml.datatype,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo,  javax.xml.datatype,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.model,
- org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.util;
-  uses:="org.eclipse.emf.ecore.xml.type.util,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.validation;
-  uses:="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo,
-   org.eclipse.emf.common.util,
-   javax.xml.datatype,
-   org.eclipse.emf.ecore.util",
+ org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.util;uses:="org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo,  org.eclipse.emf.common.util,  javax.xml.datatype,  org.eclipse.emf.ecore.util",
  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl;
-  uses:="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl;uses:="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,org.eclipse.emf.common.util",
  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.model,
  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary;uses:="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl,
-   org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl,  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.validation,
  org.eclipse.emf.teneo.samples.emf.sample.sunBooks;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl;
-  uses:="org.eclipse.emf.teneo.samples.emf.sample.sunBooks,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl;uses:="org.eclipse.emf.teneo.samples.emf.sample.sunBooks,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.sunBooks.model,
- org.eclipse.emf.teneo.samples.emf.sample.sunBooks.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.teneo.samples.emf.sample.sunBooks,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.sunBooks.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.sample.sunBooks,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.sunBooks.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.sunBooks,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
  org.eclipse.emf.teneo.samples.emf.sample.workflow;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.workflow.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.sample.workflow,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.workflow.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.workflow,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.workflow.model,
- org.eclipse.emf.teneo.samples.emf.sample.workflow.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.sample.workflow,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.workflow.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.workflow,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype,
-   org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.validation;
-  uses:="org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.validation;uses:="org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime,org.eclipse.emf.ecore.util",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl,
@@ -1200,290 +402,68 @@
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.duration.util,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.duration.validation,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs;uses:="org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs,org.eclipse.emf.ecore.util",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.model,
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap,org.eclipse.emf.common.util",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.util;
-  uses:="org.eclipse.emf.ecore.xml.type.util,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.util;uses:="org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension,org.eclipse.emf.common.util",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.list;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.list;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list,org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.util;
-  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list,
-   org.eclipse.emf.ecore.xml.type.util,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.util;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list,  org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.validation,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.util;
-  uses:="org.eclipse.emf.ecore.xml.type.util,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.validation;uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.util;uses:="org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.validation;uses:=org.eclipse.emf.common.util,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.model,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.modelgroup,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.modelgroup.impl,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.modelgroup.util,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname;
-  uses:="javax.xml.namespace,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname,
-   javax.xml.namespace,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.validation;
-  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname,
-   javax.xml.namespace,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname;uses:="javax.xml.namespace,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname,  javax.xml.namespace,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname,  javax.xml.namespace,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.validation,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.model,
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.util;
-  uses:="org.eclipse.emf.ecore.xml.type.util,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.util;uses:="org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl;
-  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.util;
-  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution,
-   org.eclipse.emf.ecore.xml.type.util,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.util;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution,  org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl;
-  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.util;
-  uses:="org.eclipse.emf.ecore.xml.type.util,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.util;uses:="org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.abstractreference;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.abstractreference.impl;
-  uses:="org.eclipse.emf.teneo.samples.issues.abstractreference,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.abstractreference.impl;uses:="org.eclipse.emf.teneo.samples.issues.abstractreference,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.abstractreference.model,
- org.eclipse.emf.teneo.samples.issues.abstractreference.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.teneo.samples.issues.abstractreference,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.issues.abstractreference.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.issues.abstractreference,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.issues.abstractsuper,
  org.eclipse.emf.teneo.samples.issues.abstractsuper.impl,
  org.eclipse.emf.teneo.samples.issues.abstractsuper.model,
@@ -1493,22 +473,9 @@
  org.eclipse.emf.teneo.samples.issues.adept.impl,
  org.eclipse.emf.teneo.samples.issues.adept.util,
  org.eclipse.emf.teneo.samples.issues.bagduplicate;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.bagduplicate.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.issues.bagduplicate,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.bagduplicate.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.issues.bagduplicate,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.bagduplicate.model,
- org.eclipse.emf.teneo.samples.issues.bagduplicate.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.teneo.samples.issues.bagduplicate,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.bagduplicate.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.issues.bagduplicate,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.bz224991,
  org.eclipse.emf.teneo.samples.issues.bz224991.impl,
  org.eclipse.emf.teneo.samples.issues.bz224991.model,
@@ -1639,59 +606,20 @@
  org.eclipse.emf.teneo.samples.issues.enumtest;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.enumtest.impl;uses:="org.eclipse.emf.teneo.samples.issues.enumtest,org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.enumtest.model,
- org.eclipse.emf.teneo.samples.issues.enumtest.util;
-  uses:="org.eclipse.emf.teneo.samples.issues.enumtest,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.issues.enumtest.util;uses:="org.eclipse.emf.teneo.samples.issues.enumtest,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.issues.generaltest;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.generaltest.impl;
-  uses:="org.eclipse.emf.teneo.samples.issues.generaltest,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.generaltest.impl;uses:="org.eclipse.emf.teneo.samples.issues.generaltest,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.generaltest.model,
- org.eclipse.emf.teneo.samples.issues.generaltest.util;
-  uses:="org.eclipse.emf.teneo.samples.issues.generaltest,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.generaltest.util;uses:="org.eclipse.emf.teneo.samples.issues.generaltest,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.generaltest.validation;uses:="org.eclipse.emf.teneo.samples.issues.generaltest,org.eclipse.emf.common.util",
  org.eclipse.emf.teneo.samples.issues.inheritance;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.inheritance.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.issues.inheritance,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.inheritance.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.issues.inheritance,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.inheritance.model,
- org.eclipse.emf.teneo.samples.issues.inheritance.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.teneo.samples.issues.inheritance,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.issues.interfacetrue;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.inheritance.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.issues.inheritance,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.issues.interfacetrue;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.issues.interfacetrue.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.issues.interfacetrue,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.interfacetrue.model,
- org.eclipse.emf.teneo.samples.issues.interfacetrue.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.teneo.samples.issues.interfacetrue,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.interfacetrue.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.issues.interfacetrue,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.largemapvalue,
  org.eclipse.emf.teneo.samples.issues.largemapvalue.impl,
  org.eclipse.emf.teneo.samples.issues.largemapvalue.model,
@@ -1699,23 +627,9 @@
  org.eclipse.emf.teneo.samples.issues.library,
  org.eclipse.emf.teneo.samples.issues.library.util,
  org.eclipse.emf.teneo.samples.issues.mtmsame;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.mtmsame.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.issues.mtmsame,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.mtmsame.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.issues.mtmsame,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.mtmsame.model,
- org.eclipse.emf.teneo.samples.issues.mtmsame.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.issues.mtmsame,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.mtmsame.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.issues.mtmsame,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.nav,
  org.eclipse.emf.teneo.samples.issues.nav.impl,
  org.eclipse.emf.teneo.samples.issues.nav.util,
@@ -1728,35 +642,13 @@
  org.eclipse.emf.teneo.samples.issues.nonmandatoryjoincolumn.impl,
  org.eclipse.emf.teneo.samples.issues.nonmandatoryjoincolumn.util,
  org.eclipse.emf.teneo.samples.issues.refresh;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.refresh.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.issues.refresh,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.refresh.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.issues.refresh,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.refresh.model,
- org.eclipse.emf.teneo.samples.issues.refresh.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.teneo.samples.issues.refresh,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.issues.resource;uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.refresh.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.issues.refresh,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.issues.resource;uses:=org.eclipse.emf.ecore,
  org.eclipse.emf.teneo.samples.issues.resource.impl;uses:="org.eclipse.emf.teneo.samples.issues.resource,org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.resource.model,
- org.eclipse.emf.teneo.samples.issues.resource.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.teneo.samples.issues.resource,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.issues.resource.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.issues.resource,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.issues.resourceunload,
  org.eclipse.emf.teneo.samples.issues.resourceunload.impl,
  org.eclipse.emf.teneo.samples.issues.resourceunload.model,
@@ -1768,74 +660,25 @@
  org.eclipse.emf.teneo.samples.issues.simplearray.impl,
  org.eclipse.emf.teneo.samples.issues.simplearray.util,
  org.eclipse.emf.teneo.samples.issues.simplenm;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.simplenm.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.issues.simplenm,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.simplenm.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.issues.simplenm,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.simplenm.model,
- org.eclipse.emf.teneo.samples.issues.simplenm.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.teneo.samples.issues.simplenm,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.issues.simplenm.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.issues.simplenm,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.issues.top,
  org.eclipse.emf.teneo.samples.issues.top.impl,
  org.eclipse.emf.teneo.samples.issues.top.util,
  org.eclipse.emf.teneo.samples.issues.top.validation,
  org.eclipse.emf.teneo.samples.issues.topclasses;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.topclasses.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.teneo.samples.issues.topclasses,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.topclasses.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.issues.topclasses,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.topclasses.model,
- org.eclipse.emf.teneo.samples.issues.topclasses.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.teneo.samples.issues.topclasses,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.topclasses.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.issues.topclasses,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.transientsuper;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.transientsuper.impl;
-  uses:="org.eclipse.emf.teneo.samples.issues.transientsuper,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.transientsuper.impl;uses:="org.eclipse.emf.teneo.samples.issues.transientsuper,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.transientsuper.model,
- org.eclipse.emf.teneo.samples.issues.transientsuper.util;
-  uses:="org.eclipse.emf.teneo.samples.issues.transientsuper,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.transientsuper.util;uses:="org.eclipse.emf.teneo.samples.issues.transientsuper,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.update;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.update.impl;
-  uses:="org.eclipse.emf.teneo.samples.issues.update,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.update.impl;uses:="org.eclipse.emf.teneo.samples.issues.update,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.update.model,
- org.eclipse.emf.teneo.samples.issues.update.util;
-  uses:="org.eclipse.emf.teneo.samples.issues.update,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.update.util;uses:="org.eclipse.emf.teneo.samples.issues.update,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.eclipse.emf.test.databinding.emfdb,
  org.eclipse.emf.test.databinding.emfdb.impl,
  org.eclipse.emf.test.databinding.emfdb.util,
@@ -1846,75 +689,28 @@
  org.eclipse.example.library.util,
  org.eclipse.example.library.validation,
  org.example.mindmap;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.example.mindmap.impl;
-  uses:="org.example.mindmap,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
+ org.example.mindmap.impl;uses:="org.example.mindmap,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
  org.example.mindmap.model,
- org.example.mindmap.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.example.mindmap,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource,
-   org.eclipse.emf.ecore",
+ org.example.mindmap.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.example.mindmap,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
  org.w3._2000._09.xmldsig,
  org.w3._2000._09.xmldsig.impl,
  org.w3._2000._09.xmldsig.util,
  tc.apple;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- tc.apple.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   tc.apple,
-   org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore",
- tc.apple.util;
-  uses:="org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   tc.apple,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ tc.apple.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  tc.apple,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ tc.apple.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  tc.apple,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  tc.apple.validation;uses:="org.eclipse.emf.common.util,tc.apple,org.eclipse.emf.ecore.util",
- tc.tree;uses:="org.eclipse.emf.ecore",
+ tc.tree;uses:=org.eclipse.emf.ecore,
  tc.tree.impl;uses:="tc.tree,org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore",
- tc.tree.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   tc.tree,
-   org.eclipse.emf.ecore.xmi.util,
-   org.eclipse.emf.ecore.resource.impl,
-   org.eclipse.emf.ecore.xmi.impl,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.resource",
+ tc.tree.util;uses:="org.eclipse.emf.common.notify.impl,  tc.tree,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
  tc.tree.validation,
  temporal,
  temporal.impl,
  temporal.mod,
  temporal.util,
  testinheritance;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- testinheritance.impl;
-  uses:="org.eclipse.emf.ecore.impl,
-   testinheritance,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore",
+ testinheritance.impl;uses:="org.eclipse.emf.ecore.impl,  testinheritance,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
  testinheritance.model,
- testinheritance.util;
-  uses:="org.eclipse.emf.common.notify.impl,
-   testinheritance,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.ecore",
+ testinheritance.util;uses:="org.eclipse.emf.common.notify.impl,  testinheritance,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
  testinheritance.validation;uses:="testinheritance,org.eclipse.emf.common.util"
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.emf.teneo.samples/plugin.xml b/tests/org.eclipse.emf.teneo.samples/plugin.xml
index f7a533b..3cb83a3 100755
--- a/tests/org.eclipse.emf.teneo.samples/plugin.xml
+++ b/tests/org.eclipse.emf.teneo.samples/plugin.xml
@@ -23,4 +23,18 @@
             class="org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.util.DocumentrootResourceFactoryImpl"/>
    </extension>
 
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated bz398161 -->
+      <package
+            uri="http://www.eclipse.org/emf/teneo/samples/issues/bz398161"
+            class="org.eclipse.emf.teneo.samples.issues.bz398161.Bz398161Package"
+            genModel="src/org/eclipse/emf/teneo/samples/issues/bz398161/model/bz398161.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated bz398161 -->
+      <parser
+            type="bz398161"
+            class="org.eclipse.emf.teneo.samples.issues.bz398161.util.Bz398161ResourceFactoryImpl"/>
+   </extension>
 </plugin>
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/Bz398161Package.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/Bz398161Package.java
index 9626d7b..238b317 100644
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/Bz398161Package.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/Bz398161Package.java
@@ -84,13 +84,22 @@
 	int REF_ONE__REF_TWO = 1;
 
 	/**
+	 * The feature id for the '<em><b>String Val</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REF_ONE__STRING_VAL = 2;
+
+	/**
 	 * The number of structural features of the '<em>Ref One</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int REF_ONE_FEATURE_COUNT = 2;
+	int REF_ONE_FEATURE_COUNT = 3;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.issues.bz398161.impl.RefTwoImpl <em>Ref Two</em>}' class.
@@ -154,6 +163,17 @@
 	EReference getRefOne_RefTwo();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.issues.bz398161.RefOne#getStringVal <em>String Val</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>String Val</em>'.
+	 * @see org.eclipse.emf.teneo.samples.issues.bz398161.RefOne#getStringVal()
+	 * @see #getRefOne()
+	 * @generated
+	 */
+	EAttribute getRefOne_StringVal();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.issues.bz398161.RefTwo <em>Ref Two</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -223,6 +243,14 @@
 		EReference REF_ONE__REF_TWO = eINSTANCE.getRefOne_RefTwo();
 
 		/**
+		 * The meta object literal for the '<em><b>String Val</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute REF_ONE__STRING_VAL = eINSTANCE.getRefOne_StringVal();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.issues.bz398161.impl.RefTwoImpl <em>Ref Two</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/RefOne.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/RefOne.java
index 9466d80..90d3957 100644
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/RefOne.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/RefOne.java
@@ -14,6 +14,7 @@
  * <ul>
  *   <li>{@link org.eclipse.emf.teneo.samples.issues.bz398161.RefOne#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.samples.issues.bz398161.RefOne#getRefTwo <em>Ref Two</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.issues.bz398161.RefOne#getStringVal <em>String Val</em>}</li>
  * </ul>
  * </p>
  *
@@ -132,4 +133,59 @@
 	 */
 	boolean isSetRefTwo();
 
+	/**
+	 * Returns the value of the '<em><b>String Val</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>String Val</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>String Val</em>' attribute.
+	 * @see #isSetStringVal()
+	 * @see #unsetStringVal()
+	 * @see #setStringVal(String)
+	 * @see org.eclipse.emf.teneo.samples.issues.bz398161.Bz398161Package#getRefOne_StringVal()
+	 * @model unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+	 *        annotation="teneo.jpa appinfo='\n\t\t\t\t\t\t@Column(name=\"stringVal\",columnDefinition = \"CHARACTER(64) NOT NULL\")\n\t\t\t\t\t'"
+	 *        extendedMetaData="kind='element' name='stringVal'"
+	 * @generated
+	 */
+	String getStringVal();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.issues.bz398161.RefOne#getStringVal <em>String Val</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>String Val</em>' attribute.
+	 * @see #isSetStringVal()
+	 * @see #unsetStringVal()
+	 * @see #getStringVal()
+	 * @generated
+	 */
+	void setStringVal(String value);
+
+	/**
+	 * Unsets the value of the '{@link org.eclipse.emf.teneo.samples.issues.bz398161.RefOne#getStringVal <em>String Val</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetStringVal()
+	 * @see #getStringVal()
+	 * @see #setStringVal(String)
+	 * @generated
+	 */
+	void unsetStringVal();
+
+	/**
+	 * Returns whether the value of the '{@link org.eclipse.emf.teneo.samples.issues.bz398161.RefOne#getStringVal <em>String Val</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>String Val</em>' attribute is set.
+	 * @see #unsetStringVal()
+	 * @see #getStringVal()
+	 * @see #setStringVal(String)
+	 * @generated
+	 */
+	boolean isSetStringVal();
+
 } // RefOne
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/impl/Bz398161FactoryImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/impl/Bz398161FactoryImpl.java
index bc681ee..95c8f30 100644
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/impl/Bz398161FactoryImpl.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/impl/Bz398161FactoryImpl.java
@@ -27,7 +27,7 @@
 	 */
 	public static Bz398161Factory init() {
 		try {
-			Bz398161Factory theBz398161Factory = (Bz398161Factory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/teneo/samples/issues/bz398161"); 
+			Bz398161Factory theBz398161Factory = (Bz398161Factory)EPackage.Registry.INSTANCE.getEFactory(Bz398161Package.eNS_URI);
 			if (theBz398161Factory != null) {
 				return theBz398161Factory;
 			}
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/impl/Bz398161PackageImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/impl/Bz398161PackageImpl.java
index c4fcf8d..3637ca1 100644
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/impl/Bz398161PackageImpl.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/impl/Bz398161PackageImpl.java
@@ -133,6 +133,15 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getRefOne_StringVal() {
+		return (EAttribute)refOneEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getRefTwo() {
 		return refTwoEClass;
 	}
@@ -177,6 +186,7 @@
 		refOneEClass = createEClass(REF_ONE);
 		createEAttribute(refOneEClass, REF_ONE__ID);
 		createEReference(refOneEClass, REF_ONE__REF_TWO);
+		createEAttribute(refOneEClass, REF_ONE__STRING_VAL);
 
 		refTwoEClass = createEClass(REF_TWO);
 		createEAttribute(refTwoEClass, REF_TWO__NUMBER);
@@ -218,6 +228,7 @@
 		initEClass(refOneEClass, RefOne.class, "RefOne", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getRefOne_Id(), theXMLTypePackage.getLong(), "id", null, 1, 1, RefOne.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getRefOne_RefTwo(), this.getRefTwo(), null, "refTwo", null, 1, 1, RefOne.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getRefOne_StringVal(), theXMLTypePackage.getString(), "stringVal", null, 1, 1, RefOne.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(refTwoEClass, RefTwo.class, "RefTwo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getRefTwo_Number(), theXMLTypePackage.getString(), "number", null, 1, 1, RefTwo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -260,6 +271,13 @@
 		   new String[] {
 			 "kind", "element",
 			 "name", "refTwo"
+		   });			
+		addAnnotation
+		  (getRefOne_StringVal(), 
+		   source, 
+		   new String[] {
+			 "kind", "element",
+			 "name", "stringVal"
 		   });		
 		addAnnotation
 		  (refTwoEClass, 
@@ -296,6 +314,12 @@
 		   source, 
 		   new String[] {
 			 "appinfo", "\n\t\t\t\t\t\t@JoinColumn(name=\"prodr_num\",columnDefinition = \"CHARACTER(6) NOT NULL\")\n\t\t\t\t\t"
+		   });			
+		addAnnotation
+		  (getRefOne_StringVal(), 
+		   source, 
+		   new String[] {
+			 "appinfo", "\n\t\t\t\t\t\t@Column(name=\"stringVal\",columnDefinition = \"CHARACTER(64) NOT NULL\")\n\t\t\t\t\t"
 		   });				
 		addAnnotation
 		  (getRefTwo_Number(), 
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/impl/RefOneImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/impl/RefOneImpl.java
index 6f315f4..9ba0d4e 100644
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/impl/RefOneImpl.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/impl/RefOneImpl.java
@@ -24,6 +24,7 @@
  * <ul>
  *   <li>{@link org.eclipse.emf.teneo.samples.issues.bz398161.impl.RefOneImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.samples.issues.bz398161.impl.RefOneImpl#getRefTwo <em>Ref Two</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.issues.bz398161.impl.RefOneImpl#getStringVal <em>String Val</em>}</li>
  * </ul>
  * </p>
  *
@@ -79,6 +80,35 @@
 	protected boolean refTwoESet;
 
 	/**
+	 * The default value of the '{@link #getStringVal() <em>String Val</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStringVal()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String STRING_VAL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getStringVal() <em>String Val</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStringVal()
+	 * @generated
+	 * @ordered
+	 */
+	protected String stringVal = STRING_VAL_EDEFAULT;
+
+	/**
+	 * This is true if the String Val attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean stringValESet;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -243,6 +273,52 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String getStringVal() {
+		return stringVal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStringVal(String newStringVal) {
+		String oldStringVal = stringVal;
+		stringVal = newStringVal;
+		boolean oldStringValESet = stringValESet;
+		stringValESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, Bz398161Package.REF_ONE__STRING_VAL, oldStringVal, stringVal, !oldStringValESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetStringVal() {
+		String oldStringVal = stringVal;
+		boolean oldStringValESet = stringValESet;
+		stringVal = STRING_VAL_EDEFAULT;
+		stringValESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, Bz398161Package.REF_ONE__STRING_VAL, oldStringVal, STRING_VAL_EDEFAULT, oldStringValESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetStringVal() {
+		return stringValESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
@@ -264,6 +340,8 @@
 				return getId();
 			case Bz398161Package.REF_ONE__REF_TWO:
 				return getRefTwo();
+			case Bz398161Package.REF_ONE__STRING_VAL:
+				return getStringVal();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -282,6 +360,9 @@
 			case Bz398161Package.REF_ONE__REF_TWO:
 				setRefTwo((RefTwo)newValue);
 				return;
+			case Bz398161Package.REF_ONE__STRING_VAL:
+				setStringVal((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -300,6 +381,9 @@
 			case Bz398161Package.REF_ONE__REF_TWO:
 				unsetRefTwo();
 				return;
+			case Bz398161Package.REF_ONE__STRING_VAL:
+				unsetStringVal();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -316,6 +400,8 @@
 				return isSetId();
 			case Bz398161Package.REF_ONE__REF_TWO:
 				return isSetRefTwo();
+			case Bz398161Package.REF_ONE__STRING_VAL:
+				return isSetStringVal();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -332,6 +418,8 @@
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (id: ");
 		if (idESet) result.append(id); else result.append("<unset>");
+		result.append(", stringVal: ");
+		if (stringValESet) result.append(stringVal); else result.append("<unset>");
 		result.append(')');
 		return result.toString();
 	}
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/model/bz398161.ecore b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/model/bz398161.ecore
index 064ef27..fd5e104 100644
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/model/bz398161.ecore
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/model/bz398161.ecore
@@ -27,6 +27,16 @@
         <details key="name" value="refTwo"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stringVal" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String" unsettable="true">
+      <eAnnotations source="teneo.jpa">
+        <details key="appinfo" value="&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;@Column(name=&quot;stringVal&quot;,columnDefinition = &quot;CHARACTER(64) NOT NULL&quot;)&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
+      </eAnnotations>
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="stringVal"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="RefTwo">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/model/bz398161.genmodel b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/model/bz398161.genmodel
index 32435dd..87ad1c5 100644
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/model/bz398161.genmodel
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/model/bz398161.genmodel
@@ -9,6 +9,7 @@
     <genClasses ecoreClass="bz398161.ecore#//RefOne">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute bz398161.ecore#//RefOne/id"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference bz398161.ecore#//RefOne/refTwo"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute bz398161.ecore#//RefOne/stringVal"/>
     </genClasses>
     <genClasses ecoreClass="bz398161.ecore#//RefTwo">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute bz398161.ecore#//RefTwo/number"/>
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/model/bz398161.xsd b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/model/bz398161.xsd
index 3cd4a1f..8785e11 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/model/bz398161.xsd
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/issues/bz398161/model/bz398161.xsd
@@ -22,6 +22,14 @@
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
+			<xsd:element name="stringVal" nillable="true"
+				type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo source="teneo.jpa">
+						@Column(name="stringVal",columnDefinition = "CHARACTER(64) NOT NULL")
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>